diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-14 19:17:36 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-14 19:17:36 -0700 |
| commit | 7099e09a5cb8e2c263890f65f5b3ad01afe88a8e (patch) | |
| tree | 9f4b01e478ebbb5e5e0d9f05713c8306f86c5ac6 | |
| parent | 97b990c9bf0c08e9088ea8dea54177c044eaa6ad (diff) | |
| parent | db3d99f7c73885abf38ff7f628972f025d44b98a (diff) | |
| download | volse-hubzilla-7099e09a5cb8e2c263890f65f5b3ad01afe88a8e.tar.gz volse-hubzilla-7099e09a5cb8e2c263890f65f5b3ad01afe88a8e.tar.bz2 volse-hubzilla-7099e09a5cb8e2c263890f65f5b3ad01afe88a8e.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
| -rw-r--r-- | mod/siteinfo.php | 5 | ||||
| -rwxr-xr-x | view/tpl/siteinfo.tpl | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 8281a7a0a..14aaef144 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -150,6 +150,9 @@ function siteinfo_content(&$a) { if(file_exists('doc/site_donate.html')) $donate .= file_get_contents('doc/site_donate.html'); + if(function_exists('sys_getloadavg')) + $loadavg = sys_getloadavg(); + $o = replace_macros(get_markup_template('siteinfo.tpl'), array( '$title' => t('$Projectname'), '$description' => t('This is a hub of $Projectname - a global cooperative network of decentralized privacy enhanced websites.'), @@ -158,6 +161,8 @@ function siteinfo_content(&$a) { '$tag' => $tag, '$polled' => t('Last background fetch: '), '$lastpoll' => get_poller_runtime(), + '$load_average' => t('Current load average: '), + '$loadavg_all' => $loadavg[0] . ', ' . $loadavg[1] . ', ' . $loadavg[2], '$commit' => $commit, '$web_location' => t('Running at web location') . ' ' . z_root(), '$visit' => t('Please visit <a href="https://redmatrix.me">redmatrix.me</a> to learn more about $Projectname.'), diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index 3b0c8841c..0b16f5602 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -10,6 +10,7 @@ {{if $polled}} <p>{{$polled}} {{$lastpoll}}</p> {{/if}} +<p>{{$load_average}} {{$loadavg_all}}</p> <p>{{$web_location}}</p> <p>{{$visit}}</p> <p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p> |