json bug fix

git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@189 251d49ef-1d17-4917-a970-b30cf55b089b

diff --git a/prometheus.c b/prometheus.c
index e58677c13350faa9af4fe1783fbab7f050fc9cca..6aaa3c78869793a9c3042eb18a6e5bc0e5fb8235 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -58,7 +58,7 @@ char          *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */
 char        *classmap = "/var/lib/misc/prometheus.classes"; /* credit log file */\r
 char            *html = "/var/www/traffic.html"; /* hall of fame - html version */\r
 char         *preview = "/var/www/preview.html"; /* hall of fame preview */\r
-char            *json = "/var/www/traffic.json"; /* hall of fame - json version */\r
+char            *json = "/var/www/logs/traffic.json"; /* hall of fame - json version */\r
 char          *cmdlog = "/var/log/prometheuslog"; /* command log filename */\r
 char         *log_dir = "/var/www/logs/"; /* log directory pathname, ended with slash */\r
 char         *log_url = "/logs/"; /* log directory relative URI prefix (partial URL) */\r
@@ -1649,17 +1649,17 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
    fprintf(f, "{\n");\r
    for_each(ip, ips)\r
    {\r
-    if(jsoncount)\r
-    {\r
-     fprintf(f, ",\n");\r
-    }\r
     if(     ip->lmsid > 0 \r
         && (ip->traffic || ip->direct || ip->proxy || ip->upload))\r
     {\r
+     if(jsoncount)\r
+     {\r
+      fprintf(f, ",\n");\r
+     }\r
      fprintf(f, " \"%s\":{ \"lms\": %d, \"ip\":\"%s\", \"total\":%Lu, \"down\":%Lu, \"proxy\":%Lu, \"up\":%Lu }",\r
                 ip->name, ip->lmsid, ip->addr, ip->traffic, ip->direct, ip->proxy, ip->upload);\r
+     jsoncount++;\r
     }\r
-    jsoncount++;\r
    }\r
    fprintf(f, "}\n");\r
    fclose(f);\r