comparison: src/server/safs/addlog.c
src/server/safs/addlog.c
- changeset 415
- d938228c382e
- parent 196
- 0459c94a60ed
equal
deleted
inserted
replaced
| 414:99a34860c105 | 415:d938228c382e |
|---|---|
| 70 if(!len) { | 70 if(!len) { |
| 71 len = "0"; | 71 len = "0"; |
| 72 } | 72 } |
| 73 | 73 |
| 74 // remove trailing line feed | 74 // remove trailing line feed |
| 75 sstr_t tmstr = sstr(time); | 75 cxstring tmstr = cx_str(time); |
| 76 if(tmstr.ptr[tmstr.length-1] == '\n') { | 76 if(tmstr.ptr[tmstr.length-1] == '\n') { |
| 77 tmstr.length--; | 77 tmstr.length--; |
| 78 } | 78 } |
| 79 tmstr = sstrdup_pool(sn->pool, tmstr); | |
| 80 | 79 |
| 81 if(combined) { | 80 if(combined) { |
| 82 char *referer = pblock_findval("referer", rq->headers); | 81 char *referer = pblock_findval("referer", rq->headers); |
| 83 char *user_agent = pblock_findval("user-agent", rq->headers); | 82 char *user_agent = pblock_findval("user-agent", rq->headers); |
| 84 int refq = 1; | 83 int refq = 1; |
| 91 user_agent = "-"; | 90 user_agent = "-"; |
| 92 uaq = 0; | 91 uaq = 0; |
| 93 } | 92 } |
| 94 fprintf( | 93 fprintf( |
| 95 log->log->file, | 94 log->log->file, |
| 96 "%s - %s [%s] \"%s\" %d %s %.*s%s%.*s %.*s%s%.*s\n", | 95 "%s - %s [%.*s] \"%s\" %d %s %.*s%s%.*s %.*s%s%.*s\n", |
| 97 ip, | 96 ip, |
| 98 user, | 97 user, |
| 98 (int)tmstr.length, | |
| 99 tmstr.ptr, | 99 tmstr.ptr, |
| 100 req, | 100 req, |
| 101 rq->status_num, | 101 rq->status_num, |
| 102 len, | 102 len, |
| 103 refq, | 103 refq, |
| 112 "\"" | 112 "\"" |
| 113 ); | 113 ); |
| 114 } else { | 114 } else { |
| 115 fprintf( | 115 fprintf( |
| 116 log->log->file, | 116 log->log->file, |
| 117 "%s - %s [%s] \"%s\" %d %s\n", | 117 "%s - %s [%.*s] \"%s\" %d %s\n", |
| 118 ip, | 118 ip, |
| 119 user, | 119 user, |
| 120 (int)tmstr.length, | |
| 120 tmstr.ptr, | 121 tmstr.ptr, |
| 121 req, | 122 req, |
| 122 rq->status_num, | 123 rq->status_num, |
| 123 len); | 124 len); |
| 124 } | 125 } |
