commit 9cce2ee

Some tweaks to the logging system.

 1@@ -90,7 +90,7 @@ int validate_uid(const char *uid)
 2 }
 3 
 4 
 5-void srv_debug(int level, xs_str *str)
 6+void srv_log(xs_str *str)
 7 /* logs a debug message */
 8 {
 9     if (xs_str_in(str, srv_basedir) != -1) {
10@@ -98,25 +98,23 @@ void srv_debug(int level, xs_str *str)
11         str = xs_replace_i(str, srv_basedir, "~");
12     }
13 
14-    if (dbglevel >= level) {
15-        xs *tm = xs_str_localtime(0, "%H:%M:%S");
16-        fprintf(stderr, "%s %s\n", tm, str);
17-
18-        /* if the ~/log/ folder exists, also write to a file there */
19-        xs *dt = xs_str_localtime(0, "%Y-%m-%d");
20-        xs *lf = xs_fmt("%s/log/%s.log", srv_basedir, dt);
21-        FILE *f;
22-        if ((f = fopen(lf, "a")) != NULL) {
23-            fprintf(f, "%s %s\n", tm, str);
24-            fclose(f);
25-        }
26+    xs *tm = xs_str_localtime(0, "%H:%M:%S");
27+    fprintf(stderr, "%s %s\n", tm, str);
28+
29+    /* if the ~/log/ folder exists, also write to a file there */
30+    xs *dt = xs_str_localtime(0, "%Y-%m-%d");
31+    xs *lf = xs_fmt("%s/log/%s.log", srv_basedir, dt);
32+    FILE *f;
33+    if ((f = fopen(lf, "a")) != NULL) {
34+        fprintf(f, "%s %s\n", tm, str);
35+        fclose(f);
36     }
37 
38     xs_free(str);
39 }
40 
41 
42-void snac_debug(snac *snac, int level, xs_str *str)
43+void snac_log(snac *snac, xs_str *str)
44 /* prints a user debugging information */
45 {
46     xs *o_str = str;
47@@ -127,7 +125,7 @@ void snac_debug(snac *snac, int level, xs_str *str)
48         msg = xs_replace_i(msg, snac->basedir, "~");
49     }
50 
51-    srv_debug(level, msg);
52+    srv_log(msg);
53 }
54 
55 

 1@@ -27,11 +27,9 @@ int valid_status(int status);
 2 xs_str *tid(int offset);
 3 double ftime(void);
 4 
 5-void srv_debug(int level, xs_str *str);
 6-#define srv_log(str) srv_debug(0, str)
 7-
 8-int srv_open(char *basedir, int auto_upgrade);
 9-void srv_free(void);
10+void srv_log(xs_str *str);
11+#define srv_debug(level, str) do { if (dbglevel >= (level)) \
12+    { srv_log((str)); } } while (0)
13 
14 typedef struct _snac {
15     xs_str *uid;        /* uid */
16@@ -43,14 +41,18 @@ typedef struct _snac {
17     xs_str *md5;        /* actor url md5 */
18 } snac;
19 
20+void snac_log(snac *user, xs_str *str);
21+#define snac_debug(user, level, str) do { if (dbglevel >= (level)) \
22+    { snac_log((user), (str)); } } while (0)
23+
24+int srv_open(char *basedir, int auto_upgrade);
25+void srv_free(void);
26+
27 int user_open(snac *snac, const char *uid);
28 void user_free(snac *snac);
29 xs_list *user_list(void);
30 int user_open_by_md5(snac *snac, const char *md5);
31 
32-void snac_debug(snac *snac, int level, xs_str *str);
33-#define snac_log(snac, str) snac_debug(snac, 0, str)
34-
35 int validate_uid(const char *uid);
36 
37 xs_str *hash_password(const char *uid, const char *passwd, const char *nonce);