server status add getloadavg and lib version and more css

Signed-off-by: Andy Green <andy@warmcat.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b244a7..d4efa96 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -412,6 +412,7 @@ CHECK_FUNCTION_EXISTS(getifaddrs LWS_HAVE_GETIFADDRS)
 CHECK_FUNCTION_EXISTS(snprintf LWS_HAVE_SNPRINTF)
 CHECK_FUNCTION_EXISTS(_snprintf LWS_HAVE__SNPRINTF)
 CHECK_FUNCTION_EXISTS(_vsnprintf LWS_HAVE__VSNPRINTF)
+CHECK_FUNCTION_EXISTS(getloadavg LWS_HAVE_GETLOADAVG)
 
 if (NOT LWS_HAVE_GETIFADDRS)
        if (LWS_WITHOUT_BUILTIN_GETIFADDRS)

diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
index 468dea6..344258a 100644 (file)
--- a/lib/libwebsockets.c
+++ b/lib/libwebsockets.c
@@ -2464,16 +2464,31 @@ lws_json_dump_context(const struct lws_context *context, char *buf, int len)
        int listening = 0, cgi_count = 0, n;
 
        buf += snprintf(buf, end - buf, "{ "
+                                       "\"version\":\"%s\",\n"
                                        "\"uptime\":\"%ld\",\n"
                                        "\"cgi_spawned\":\"%d\",\n"
                                        "\"pt_fd_max\":\"%d\",\n"
                                        "\"ah_pool_max\":\"%d\",\n"
                                        "\"wsi_alive\":\"%d\",\n",
+                                       lws_get_library_version(),
                                        (unsigned long)(t - context->time_up),
                                        context->count_cgi_spawned,
                                        context->fd_limit_per_thread,
                                        context->max_http_header_pool,
                                        context->count_wsi_allocated);
+#ifdef LWS_HAVE_GETLOADAVG
+       {
+               double d[3];
+               int m;
+
+               m = getloadavg(d, 3);
+               for (n = 0; n < m; n++) {
+                       buf += snprintf(buf, end - buf,
+                               "\"l%d\":\"%.2f\",\n",
+                               n + 1, d[n]);
+               }
+       }
+#endif
 
        buf += snprintf(buf, end - buf, "\"pt\":[\n ");
        for (n = 0; n < context->count_threads; n++) {

diff --git a/lws_config_private.h.in b/lws_config_private.h.in
index 2079e90..c58d8b6 100644 (file)
--- a/lws_config_private.h.in
+++ b/lws_config_private.h.in
@@ -102,6 +102,8 @@
 /* Define to 1 if you have the <zlib.h> header file. */
 #cmakedefine LWS_HAVE_ZLIB_H
 
+#cmakedefine LWS_HAVE_GETLOADAVG
+
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #undef LT_OBJDIR // We're not using libtool

diff --git a/plugins/server-status.html b/plugins/server-status.html
index 155ac2c..5a299c8 100644 (file)
--- a/plugins/server-status.html
+++ b/plugins/server-status.html
@@ -8,6 +8,16 @@
                        text-align:center; color:#000000; }
        span.mount { font-size:10pt; font: Arial; font-weight:normal;
                        text-align:center; color:#000000; }
+       span.mountname { font-size:14pt; font: Arial; font-weight:bold;
+                       text-align:center; color:#404010; }
+       span.n { font-size:12pt; font: Arial; font-weight:normal;
+                       text-align:center; color:#808020; }
+       span.v { font-size:12pt; font: Arial; font-weight:bold;
+                       text-align:center; color:#202020; }
+       span.m1 { font-size:12pt; font: Arial; font-weight:bold;
+                       text-align:center; color:#202020; }
+       span.m2 { font-size:12pt; font: Arial; font-weight:normal;
+                       text-align:center; color:#202020; }
        .browser { font-size:18pt; font: Arial; font-weight:normal; text-align:center; color:#ffff00; vertical-align:middle; text-align:center; background:#d0b070; padding:12px; -webkit-border-radius:10px; -moz-border-radius:10px; border-radius:10px;}
        .group2 { vertical-align:middle;
                text-align:center;
@@ -124,6 +134,22 @@ function san(s)
        return s;
 }
 
+function humanize(s)
+{
+       i = parseInt(s);
+       
+       if (i > 1000000000)
+               return (i / 1000000000).toFixed(3) + "G";
+       
+       if (i > 1000000)
+               return (i / 1000000).toFixed(3) + "M";
+       
+       if (i > 1000)
+               return (i / 1000).toFixed(3) + "K";
+       
+       return s;
+}
+
        var pos = 0;
 
 function get_appropriate_ws_url()
@@ -170,68 +196,85 @@ function get_appropriate_ws_url()
                }
 
                socket_status.onmessage =function got_packet(msg) {
-                       document.getElementById("conninfo").innerHTML = "<pre>"+msg.data+"</pre>";
+                       var u;
+                       //document.getElementById("conninfo").innerHTML = "<pre>"+msg.data+"</pre>";
                        jso = JSON.parse(msg.data);
-                       
-                       s="<table><tr><td class=\"c\">" +
-                         "Context</td><td>Uptime: " + san(jso.uptime) + ", " +
-                         "Listening wsi: " + san(jso.listen_wsi) + ", " +
-                         "Current wsi alive: " + (parseInt(san(jso.wsi_alive)) -
-                               parseInt(san(jso.listen_wsi))) + "<br>" +
-                         "Current cgi alive: " + san(jso.cgi_alive) + ", " +
-                         "Total CGI spawned: " + san(jso.cgi_spawned) +
-                         "</td></tr>";
+                       u = parseInt(san(jso.uptime));
+                       s = "<table><tr><td class=\"c\">" +
+                         "Context</td><td>" +
+                         "<span class=n>Version:</span> <span class=v>" +
+                          san(jso.version) + "</span><br>" +
+                         "<span class=n>Uptime:</span> <span class=v>" +
+                         ((u / (24 * 3600)) | 0) + "d " +
+                         (((u % (24 * 3600)) / 3600) | 0) + "h " +
+                         (((u % 3600) / 60) | 0) + "m</span>";
+                       if (jso.l1)
+                               s = s + ", <span class=n>Load:</span> <span class=v>" + san(jso.l1) + " ";
+                       if (jso.l2)
+                               s = s + san(jso.l2) + " ";
+                       if (jso.l3)
+                               s = s + san(jso.l3);
+                       if (jso.l1)
+                               s =s + "<span>";
+                       s = s +
+                         "<br>" +
+                         "<span class=n>Listening wsi:</span> <span class=v>" + san(jso.listen_wsi) + "</span>, " +
+                         "<span class=n>Current wsi alive:</span> <span class=v>" + (parseInt(san(jso.wsi_alive)) -
+                               parseInt(san(jso.listen_wsi))) + "</span><br>" +
+                         "<span class=n>Current cgi alive:</span> <span class=v>" + san(jso.cgi_alive) + "</span>, " +
+                         "<span class=n>Total CGI spawned:</span> <span class=v>" + san(jso.cgi_spawned) +
+                         "</span></td></tr>";
                        var n;
                        for (n = 0; n < jso.pt.length; n++) {
 
                                s = s + "<tr><td class=\"l\">service thread " + (n + 1) +
                                "</td><td>" +
-                               "fds: " + san(jso.pt[n].fds_count) + " / " +
-                                         san(jso.pt_fd_max) + ", ";
-                               s = s + "ah pool: " + san(jso.pt[n].ah_pool_inuse) + " / " +
-                                             san(jso.ah_pool_max) + ", " +
-                               "ah waiting list: " + san(jso.pt[n].ah_wait_list);
+                               "<span class=n>fds:</span> <span class=v>" + san(jso.pt[n].fds_count) + " / " +
+                                         san(jso.pt_fd_max) + "</span>, ";
+                               s = s + "<span class=n>ah pool:</span> <span class=v>" + san(jso.pt[n].ah_pool_inuse) + " / " +
+                                             san(jso.ah_pool_max) + "</span>, " +
+                               "<span class=n>ah waiting list:</span> <span class=v>" + san(jso.pt[n].ah_wait_list);
 
-                               s = s + "</td></tr>";
+                               s = s + "</span></td></tr>";
 
                        }
                        for (n = 0; n < jso.vhosts.length; n++) {
                                s = s + "<tr><td class=\"l\">vhost " + (n + 1) +
-                               "</td><td><b>";
+                               "</td><td><span class=\"mountname\">";
                                if (jso.vhosts[n].use_ssl == '1')
                                        s = s + "https://";
                                else
                                        s = s + "http://";
                                s = s + san(jso.vhosts[n].name) + ":" +
-                                       san(jso.vhosts[n].port) + "</b>";
+                                       san(jso.vhosts[n].port) + "</span>";
                                if (jso.vhosts[n].sts == '1')
                                        s = s + " (STS)";
                                s = s +"<br>" +
-                               "rx " + san(jso.vhosts[n].rx) + ", " +
-                               "tx " + san(jso.vhosts[n].tx) + "<br>" +
-                               "total connections " + san(jso.vhosts[n].conn) + ", " +
-                               "total http transactions " + san(jso.vhosts[n].trans) + "<br>" +
-                               "Upgrades to ws: " + san(jso.vhosts[n].ws_upg) + ", " +
-                               "to http/2: " + san(jso.vhosts[n].http2_upg) + "<br>" +
-                               "<table><tr><td class=t>Mountpoint</td><td class=t>Origin</td><td class=t>Cache Policy</td></tr>";
+                               "<span class=n>rx:</span> <span class=v>" + humanize(san(jso.vhosts[n].rx)) + "B</span>, " +
+                               "<span class=n>tx</span> <span class=v>" + humanize(san(jso.vhosts[n].tx)) + "B</span><br>" +
+                               "<span class=n>total connections</span> <span class=v>" + san(jso.vhosts[n].conn) + "</span>, " +
+                               "<span class=n>total http transactions</span> <span class=v>" + san(jso.vhosts[n].trans) + "</span><br>" +
+                               "<span class=n>Upgrades to ws:</span> <span class=v>" + san(jso.vhosts[n].ws_upg) + "</span>, " +
+                               "<span class=n>to http/2:</span> <span class=v>" + san(jso.vhosts[n].http2_upg) + "</span><br>" +
+                               "<table style=\"margin-left:16px\"><tr><td class=t>Mountpoint</td><td class=t>Origin</td><td class=t>Cache Policy</td></tr>";
                                
                                var m;
                                for (m = 0; m < jso.vhosts[n].mounts.length; m++) {
                                        s = s + "<tr><td>";
-                                       s = s + san(jso.vhosts[n].mounts[m].mountpoint) +
-                                               "</td><td>" +
+                                       s = s + "<span class=\"m1\">" + san(jso.vhosts[n].mounts[m].mountpoint) +
+                                               "</span></td><td><span class=\"m2\">" +
                                                san(jso.vhosts[n].mounts[m].origin) +
-                                               "</td><td>";
+                                               "</span></td><td>";
                                        if (parseInt(san(jso.vhosts[n].mounts[m].cache_max_age)))
-                                               s = s + "max-age: " +
+                                               s = s + "<span class=n>max-age:</span> <span class=v>" +
                                                san(jso.vhosts[n].mounts[m].cache_max_age) +
-                                               ", reuse: " +
+                                               "</span>, <span class=n>reuse:</span> <span class=v>" +
                                                san(jso.vhosts[n].mounts[m].cache_reuse) +
-                                               ", reval: " +
+                                               "</span>, <span class=n>reval:</span> <span class=v>" +
                                                san(jso.vhosts[n].mounts[m].cache_revalidate) +
-                                               ", inter: " +
+                                               "</span>, <span class=n>inter:</span> <span class=v>" +
                                                san(jso.vhosts[n].mounts[m].cache_intermediaries);
-                                       s = s + "</td></tr>"
+                                       s = s + "</span></td></tr>"
                                }
                                s = s + "</table>";
                                s = s + "</td></tr>";