forked from osmocom/wireshark
wslog: Set registered name earlier
This commit is contained in:
parent
dddb33e398
commit
b4eddd32c1
|
@ -46,6 +46,8 @@
|
||||||
|
|
||||||
#define DEFAULT_LOG_LEVEL LOG_LEVEL_MESSAGE
|
#define DEFAULT_LOG_LEVEL LOG_LEVEL_MESSAGE
|
||||||
|
|
||||||
|
#define DEFAULT_APPNAME "PID"
|
||||||
|
|
||||||
#define DOMAIN_NOTSET(domain) ((domain) == NULL || *(domain) == '\0')
|
#define DOMAIN_NOTSET(domain) ((domain) == NULL || *(domain) == '\0')
|
||||||
|
|
||||||
|
|
||||||
|
@ -478,6 +480,8 @@ void ws_log_init(ws_log_writer_cb *writer)
|
||||||
const char *env;
|
const char *env;
|
||||||
|
|
||||||
registered_appname = g_get_prgname();
|
registered_appname = g_get_prgname();
|
||||||
|
if (registered_appname == NULL)
|
||||||
|
registered_appname = DEFAULT_APPNAME;
|
||||||
|
|
||||||
if (writer)
|
if (writer)
|
||||||
registered_log_writer = writer;
|
registered_log_writer = writer;
|
||||||
|
@ -545,15 +549,12 @@ static void log_write_do_work(FILE *fp, gboolean use_color, const char *timestam
|
||||||
{
|
{
|
||||||
const char *domain_str = domain_to_string(domain);
|
const char *domain_str = domain_to_string(domain);
|
||||||
const char *level_str = ws_log_level_to_string(level);
|
const char *level_str = ws_log_level_to_string(level);
|
||||||
gboolean doextra = (level != LOG_LEVEL_MESSAGE);
|
gboolean doextra = (level != DEFAULT_LOG_LEVEL);
|
||||||
|
|
||||||
if (doextra) {
|
if (doextra)
|
||||||
fprintf(fp, " ** (%s:%ld) ", registered_appname ?
|
fprintf(fp, " ** (%s:%ld) ", registered_appname, (long)getpid());
|
||||||
registered_appname : "PID", (long)getpid());
|
else
|
||||||
}
|
|
||||||
else {
|
|
||||||
fputs(" ** ", fp);
|
fputs(" ** ", fp);
|
||||||
}
|
|
||||||
|
|
||||||
if (timestamp) {
|
if (timestamp) {
|
||||||
fputs(timestamp, fp);
|
fputs(timestamp, fp);
|
||||||
|
|
Loading…
Reference in New Issue