nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-status-page: show site_code, domain_code & role

Browse Source 
The data should be displayed if it is availiable. In addition to that the node should also provide this information via respondd.
This commit is contained in:
Steffen Förster 2018-11-29 09:03:27 +01:00
parent bcf4d076e1
commit 1515c2d075
4 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package/gluon-respondd/src/respondd.c
View File

@ -68,6 +68,18 @@ static struct json_object * get_site_code(void) {
return ret;
}
static struct json_object * get_site_name(void) {
struct json_object *site = gluonutil_load_site_config();
if (!site)
return NULL;
struct json_object *ret = NULL;
json_object_object_get_ex(site, "site_name", &ret);
if (ret)
json_object_get(ret);
json_object_put(site);
return ret;
}
static struct json_object * get_domain_code(void) {
return gluonutil_wrap_and_free_string(gluonutil_get_domain());
}
@ -130,6 +142,7 @@ static struct json_object * respondd_provider_nodeinfo(void) {
json_object_object_add(system, "site_code", get_site_code());
if (gluonutil_has_domains())
json_object_object_add(system, "domain_code", get_domain_code());
json_object_object_add(system, "site_name", get_site_name());
json_object_object_add(ret, "system", system);
return ret;

9
package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html
View File

@ -122,6 +122,15 @@
string.format(' (%s)', nodeinfo.software.autoupdater.branch)
%></dd>
<%- end %>
<% if nodeinfo.system.role then -%>
<dt><%:Role%></dt><dd><%| nodeinfo.system.role %></dd>
<%- end %>
<% if nodeinfo.system.site_code then -%>
<dt><%:Site%></dt><dd><%| nodeinfo.system.site_code %></dd>
<%- end %>
<% if nodeinfo.system.domain_code then -%>
<dt><%:Domain%></dt><dd><%| nodeinfo.system.domain_code %></dd>
<%- end %>
</dl>
</div>
<div class="frame">

9
package/gluon-status-page/i18n/de.po
View File

@ -40,6 +40,9 @@ msgstr "Position"
msgid "Distance"
msgstr "Entfernung"
msgid "Domain"
msgstr "Domäne"
msgid "Error"
msgstr "Fehler"
@ -94,9 +97,15 @@ msgstr "RAM"
msgid "Received"
msgstr "Empfangen"
msgid "Role"
msgstr "Rolle"
msgid "Status"
msgstr "Status"
msgid "Site"
msgstr ""
msgid "Traffic"
msgstr ""

9
package/gluon-status-page/i18n/gluon-status-page.pot
View File

@ -31,6 +31,9 @@ msgstr ""
msgid "Distance"
msgstr ""
msgid "Domain"
msgstr ""
msgid "Error"
msgstr ""
@ -85,9 +88,15 @@ msgstr ""
msgid "Received"
msgstr ""
msgid "Role"
msgstr ""
msgid "Status"
msgstr ""
msgid "Site"
msgstr ""
msgid "Traffic"
msgstr ""