Unverified Commit f7a1715f authored by dmorley's avatar dmorley

Merge branch 'develop'

parents fbb8b63d 350ff968
...@@ -45,6 +45,14 @@ touch add.log in location you configured in config.php ...@@ -45,6 +45,14 @@ touch add.log in location you configured in config.php
run db/pull.sh manually or with cron to update your data run db/pull.sh manually or with cron to update your data
To Upgrade:
```
cd Poduptime
git pull
bower install
psql -u podupuser podupdb < db/migrationx.sql (see db/version.md for proper migration version)
```
============================ ============================
Source for Diaspora Pod Uptime Source for Diaspora Pod Uptime
......
...@@ -63,13 +63,17 @@ while ($row = pg_fetch_assoc($result)) { ...@@ -63,13 +63,17 @@ while ($row = pg_fetch_assoc($result)) {
$outputssl = curl_exec($chss); $outputssl = curl_exec($chss);
$outputsslerror = curl_error($chss); $outputsslerror = curl_error($chss);
$info = curl_getinfo($chss, CURLINFO_CERTINFO); $info = curl_getinfo($chss, CURLINFO_CERTINFO);
$latency = curl_getinfo($chss, CURLINFO_TOTAL_TIME); $conntime = curl_getinfo($chss, CURLINFO_CONNECT_TIME);
$nstime = curl_getinfo($chss, CURLINFO_NAMELOOKUP_TIME);
$latency = $conntime - $nstime;
$sslexpire = $info[0]['Expire date'] ?? null; $sslexpire = $info[0]['Expire date'] ?? null;
curl_close($chss); curl_close($chss);
_debug('Nodeinfo output', $outputssl, true); _debug('Nodeinfo output', $outputssl, true);
_debug('Nodeinfo output error', $outputsslerror, true); _debug('Nodeinfo output error', $outputsslerror, true);
_debug('Cert expire date', $sslexpire); _debug('Cert expire date', $sslexpire);
_debug('Conntime', $conntime);
_debug('NStime', $nstime);
_debug('Latency', $latency); _debug('Latency', $latency);
$jsonssl = json_decode($outputssl); $jsonssl = json_decode($outputssl);
......
If new install import tables.sql If new install import tables.sql
If upgrading migrations are: If upgrading migrations are:
migration00001.sql v1.0 -> v2.0 = migration00001.sql
To support the original apiv1 you should run: To support the original apiv1 you should import:
pods_apiv1.sql pods_apiv1.sql
into your db daily at least. into your db as often as you want your api updated.
...@@ -27,7 +27,7 @@ $numrows = pg_num_rows($result); ...@@ -27,7 +27,7 @@ $numrows = pg_num_rows($result);
<th><a data-toggle="tooltip" data-placement="bottom" title="Type of software this pod runs">Software</a></th> <th><a data-toggle="tooltip" data-placement="bottom" title="Type of software this pod runs">Software</a></th>
<th><a data-toggle="tooltip" data-placement="bottom" title="Percent of the time the pod is online.">Uptime</a></th> <th><a data-toggle="tooltip" data-placement="bottom" title="Percent of the time the pod is online.">Uptime</a></th>
<th><a data-toggle="tooltip" data-placement="bottom" title="Does this pod offer ipv6 connection.">IPv6</a></th> <th><a data-toggle="tooltip" data-placement="bottom" title="Does this pod offer ipv6 connection.">IPv6</a></th>
<th><a data-toggle="tooltip" data-placement="bottom" title="Average connection latency time in ms.">Latency</a></th> <th><a data-toggle="tooltip" data-placement="bottom" title="Average connection latency time in ms from Los Angeles.">Latency</a></th>
<th><a data-toggle="tooltip" data-placement="bottom" title="Does this pod allow new users.">Signups</a></th> <th><a data-toggle="tooltip" data-placement="bottom" title="Does this pod allow new users.">Signups</a></th>
<th><a data-toggle="tooltip" data-placement="bottom" title="Number of total users on this pod.">Users</a></th> <th><a data-toggle="tooltip" data-placement="bottom" title="Number of total users on this pod.">Users</a></th>
<th><a data-toggle="tooltip" data-placement="bottom" title="Number of users active last 6 months on this pod.">Active 6m</a></th> <th><a data-toggle="tooltip" data-placement="bottom" title="Number of users active last 6 months on this pod.">Active 6m</a></th>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment