char *program_str[] = {
"UNKNOWN", "planner", "driver", "amreport", "dumper", "chunker",
- "taper", "amflush", "amdump", "amidxtaped", "amfetchdump", "amcheckdump"
+ "taper", "amflush", "amdump", "amidxtaped", "amfetchdump", "amcheckdump",
+ "amvault",
};
int curlinenum;
static void close_log(void);
void
-logerror(
- char * msg)
+amanda_log_trace_log(
+ GLogLevelFlags log_level,
+ const gchar *message)
{
- log_add(L_FATAL, "%s", msg);
-}
-
-
-printf_arglist_function2(char *log_genstring, logtype_t, typ, char *, pname, char *, format)
-{
- va_list argp;
- char *leader = NULL;
- char linebuf[STR_SIZE];
- char *xlated_fmt = dgettext("C", format);
+ logtype_t logtype = L_ERROR;
- /* format error message */
-
- if((int)typ <= (int)L_BOGUS || (int)typ > (int)L_MARKER) typ = L_BOGUS;
+ switch (log_level) {
+ case G_LOG_LEVEL_ERROR:
+ case G_LOG_LEVEL_CRITICAL:
+ logtype = L_FATAL;
+ break;
- if(multiline > 0) {
- leader = stralloc(" "); /* continuation line */
- } else {
- leader = vstralloc(logtype_str[(int)typ], " ", pname, " ", NULL);
+ default:
+ return;
}
-
- arglist_start(argp, format);
- g_vsnprintf(linebuf, SIZEOF(linebuf)-1, xlated_fmt, argp);
- /* -1 to allow for '\n' */
- arglist_end(argp);
- return(vstralloc(leader, linebuf, "\n", NULL));
+ log_add(logtype, "%s", message);
}
-printf_arglist_function1(void log_add, logtype_t, typ, char *, format)
+static void log_add_full_v(logtype_t typ, char *pname, char *format, va_list argp)
{
- va_list argp;
- int saved_errout;
char *leader = NULL;
char *xlated_fmt = gettext(format);
char linebuf[STR_SIZE];
size_t n;
+ static gboolean in_log_add = 0;
+
+ /* avoid recursion */
+ if (in_log_add)
+ return;
/* format error message */
if(multiline > 0) {
leader = stralloc(" "); /* continuation line */
} else {
- leader = vstralloc(logtype_str[(int)typ], " ", get_pname(), " ", NULL);
+ leader = vstralloc(logtype_str[(int)typ], " ", pname, " ", NULL);
}
- arglist_start(argp, format);
/* use sizeof(linebuf)-2 to save space for a trailing newline */
g_vsnprintf(linebuf, SIZEOF(linebuf)-2, xlated_fmt, argp);
/* -1 to allow for '\n' */
- arglist_end(argp);
/* avoid recursive call from error() */
- saved_errout = erroutput_type;
- erroutput_type &= ~ERR_AMANDALOG;
+ in_log_add = 1;
/* append message to the log file */
if(multiline != -1) multiline++;
else close_log();
- erroutput_type = saved_errout;
+ in_log_add = 0;
+}
+
+void log_add(logtype_t typ, char *format, ...)
+{
+ va_list argp;
+
+ arglist_start(argp, format);
+ log_add_full_v(typ, get_pname(), format, argp);
+ arglist_end(argp);
+}
+
+void log_add_full(logtype_t typ, char *pname, char *format, ...)
+{
+ va_list argp;
+
+ arglist_start(argp, format);
+ log_add_full_v(typ, pname, format, argp);
+ arglist_end(argp);
}
void
{
char *conf_logdir;
- /* now that we have a logfile, let the debug module know how to write
- * error messages to it. This is due to some rather obscure linking
- * problems. */
- set_logerror(logerror);
-
conf_logdir = config_dir_relative(getconf_str(CNF_LOGDIR));
logfile = vstralloc(conf_logdir, "/log", NULL);
amfree(conf_logdir);