summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f4d23a6)
This allows the config file to add a fixed string to log messages.
This will be useful in our test suite, which mixes up output from
two instances of secnet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
logfile: dict argument
filename (string): where to log to; default is stderr
logfile: dict argument
filename (string): where to log to; default is stderr
+ prefix (string): added to messages [""]
class (string list): what type of messages to log
{ "debug-config", M_DEBUG_CONFIG },
{ "debug-phase", M_DEBUG_PHASE },
class (string list): what type of messages to log
{ "debug-config", M_DEBUG_CONFIG },
{ "debug-phase", M_DEBUG_PHASE },
string_t logfile;
uint32_t level;
FILE *f;
string_t logfile;
uint32_t level;
FILE *f;
if (class&st->level) {
t=time(NULL);
tm=localtime(&t);
if (class&st->level) {
t=time(NULL);
tm=localtime(&t);
- fprintf(st->f,"%s %2d %02d:%02d:%02d %s",
+ fprintf(st->f,"%s %2d %02d:%02d:%02d %s%s%s",
months[tm->tm_mon],tm->tm_mday,tm->tm_hour,tm->tm_min,
tm->tm_sec,
months[tm->tm_mon],tm->tm_mday,tm->tm_hour,tm->tm_min,
tm->tm_sec,
+ st->prefix, st->prefix[0] ? " " : "",
pidbuf);
vfprintf(st->f,message,args);
fprintf(st->f,"\n");
pidbuf);
vfprintf(st->f,message,args);
fprintf(st->f,"\n");
st->ops.buff[0]=0;
st->loc=loc;
st->f=stderr;
st->ops.buff[0]=0;
st->loc=loc;
st->f=stderr;
st->forked=0;
item=list_elem(args,0);
st->forked=0;
item=list_elem(args,0);
dict=item->data.dict;
st->logfile=dict_read_string(dict,"filename",False,"logfile",loc);
dict=item->data.dict;
st->logfile=dict_read_string(dict,"filename",False,"logfile",loc);
+ st->prefix=dict_read_string(dict,"prefix",False,"logfile",loc);
+ if (!st->prefix) st->prefix="";
st->level=string_list_to_word(dict_lookup(dict,"class"),
message_class_table,"logfile");
st->level=string_list_to_word(dict_lookup(dict,"class"),
message_class_table,"logfile");