aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-10-27 05:20:20 -04:00
Code

log_write_rec(): added level parameter. writing /LASTLOG to log files

Browse Source 
doesn't anymore print the current timestamp at the start of line since
/LASTLOG messages have their original timestamp already.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1235 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-02-17 12:08:31 +00:00 committed by cras
parent c0726196ea
commit e5f1216797
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/log.c
View File

@ -62,7 +62,7 @@ static int log_item_str2type(const char *type)
}
static void log_write_timestamp(int handle, const char *format,
const char *suffix, time_t stamp)
const char *text, time_t stamp)
{
struct tm *tm;
char str[256];
@ -71,10 +71,9 @@ static void log_write_timestamp(int handle, const char *format,
if (*format == '\0') return;
tm = localtime(&stamp);
if (strftime(str, sizeof(str), format, tm) > 0) {
if (strftime(str, sizeof(str), format, tm) > 0)
write_buffer(handle, str, strlen(str));
if (suffix != NULL) write_buffer(handle, suffix, strlen(suffix));
}
if (text != NULL) write_buffer(handle, text, strlen(text));
}
static char *log_filename(LOG_REC *log)
@ -182,7 +181,7 @@ static void log_rotate_check(LOG_REC *log)
g_free(new_fname);
}
void log_write_rec(LOG_REC *log, const char *str)
void log_write_rec(LOG_REC *log, const char *str, int level)
{
struct tm *tm;
time_t now;
@ -215,7 +214,10 @@ void log_write_rec(LOG_REC *log, const char *str)
log->last = now;
log_write_timestamp(log->handle, log_timestamp, str, now);
if ((level & MSGLEVEL_LASTLOG) == 0)
log_write_timestamp(log->handle, log_timestamp, str, now);
else
write_buffer(log->handle, str, strlen(str));
write_buffer(log->handle, "\n", 1);
signal_emit("log written", 2, log, str);
@ -268,18 +270,19 @@ void log_file_write(SERVER_REC *server, const char *item, int level,
fallbacks = g_slist_append(fallbacks, rec);
else if (item != NULL && log_item_find(rec, LOG_ITEM_TARGET,
item, server) != NULL)
log_write_rec(rec, str);
log_write_rec(rec, str, level);
}
if (!found && !no_fallbacks && fallbacks != NULL) {
/* not found from any items, so write it to all main logs */
tmpstr = NULL;
if (level & MSGLEVEL_PUBLIC)
tmpstr = g_strconcat(item, ": ", str, NULL);
tmpstr = (level & MSGLEVEL_PUBLIC) ?
g_strconcat(item, ": ", str, NULL) :
g_strdup(str);
g_slist_foreach(fallbacks, (GFunc) log_write_rec,
tmpstr ? tmpstr : (char *)str);
g_free_not_null(tmpstr);
for (tmp = fallbacks; tmp != NULL; tmp = tmp->next)
log_write_rec(tmp->data, tmpstr, level);
g_free(tmpstr);
}
g_slist_free(fallbacks);
}

2
src/core/log.h
View File

@ -45,7 +45,7 @@ LOG_ITEM_REC *log_item_find(LOG_REC *log, int type, const char *item,
void log_file_write(SERVER_REC *server, const char *item, int level,
const char *str, int no_fallbacks);
void log_write_rec(LOG_REC *log, const char *str);
void log_write_rec(LOG_REC *log, const char *str, int level);
int log_start_logging(LOG_REC *log);
void log_stop_logging(LOG_REC *log);

2
src/fe-common/core/fe-log.c
View File

@ -397,7 +397,7 @@ static void log_single_line(WINDOW_REC *window, void *server,
ltoa(windownum, window->refnum);
log = logs_find_item(LOG_ITEM_WINDOW_REFNUM,
windownum, NULL, NULL);
if (log != NULL) log_write_rec(log, text);
if (log != NULL) log_write_rec(log, text, level);
if (target == NULL)
log_file_write(server, NULL, level, text, FALSE);