"ERROR", "WARNING", "INFO", "SUMMARY", /* information messages */
"START", "FINISH", /* start/end of a run */
"DISK", /* disk */
- "SUCCESS", "PARTIAL", "FAIL", "STRANGE", /* the end of a dump */
+ /* the end of a dump */
+ "DONE", "PART", "PARTPARTIAL", "SUCCESS", "PARTIAL", "FAIL", "STRANGE",
"CHUNK", "CHUNKSUCCESS", /* ... continued */
"STATS", /* statistics */
"MARKER", /* marker for reporter */
char *program_str[] = {
"UNKNOWN", "planner", "driver", "amreport", "dumper", "chunker",
- "taper", "amflush"
+ "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);
-}
-
+ logtype_t logtype = L_ERROR;
-printf_arglist_function2(char *log_genstring, logtype_t, typ, char *, pname, char *, format)
-{
- va_list argp;
- char *leader = NULL;
- char linebuf[STR_SIZE];
-
-
- /* 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);
- vsnprintf(linebuf, SIZEOF(linebuf)-1, format, 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);
- vsnprintf(linebuf, SIZEOF(linebuf)-1, format, argp);
+ /* 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) open_log();
- if (fullwrite(logfd, leader, strlen(leader)) < 0) {
- error("log file write error: %s", strerror(errno));
+ if (full_write(logfd, leader, strlen(leader)) < strlen(leader)) {
+ error(_("log file write error: %s"), strerror(errno));
/*NOTREACHED*/
}
amfree(leader);
+ /* add a newline if necessary */
n = strlen(linebuf);
if(n == 0 || linebuf[n-1] != '\n') linebuf[n++] = '\n';
linebuf[n] = '\0';
- if (fullwrite(logfd, linebuf, n) < 0) {
- error("log file write error: %s", strerror(errno));
+ if (full_write(logfd, linebuf, n) < n) {
+ error(_("log file write error: %s"), strerror(errno));
/*NOTREACHED*/
}
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
if(datestamp == NULL) datestamp = "error";
- conf_logdir = getconf_str(CNF_LOGDIR);
- if (*conf_logdir == '/') {
- conf_logdir = stralloc(conf_logdir);
- } else {
- conf_logdir = stralloc2(config_dir, conf_logdir);
- }
+ conf_logdir = config_dir_relative(getconf_str(CNF_LOGDIR));
logfile = vstralloc(conf_logdir, "/log", NULL);
for(seq = 0; 1; seq++) { /* if you've got MAXINT files in your dir... */
- snprintf(seq_str, SIZEOF(seq_str), "%u", seq);
+ g_snprintf(seq_str, SIZEOF(seq_str), "%u", seq);
fname = newvstralloc(fname,
logfile,
".", datestamp,
}
if(rename(logfile, fname) == -1) {
- error("could not rename \"%s\" to \"%s\": %s",
+ error(_("could not rename \"%s\" to \"%s\": %s"),
logfile, fname, strerror(errno));
/*NOTREACHED*/
}
{
char *conf_logdir;
- conf_logdir = getconf_str(CNF_LOGDIR);
- if (*conf_logdir == '/') {
- conf_logdir = stralloc(conf_logdir);
- } else {
- conf_logdir = stralloc2(config_dir, conf_logdir);
- }
+ conf_logdir = config_dir_relative(getconf_str(CNF_LOGDIR));
logfile = vstralloc(conf_logdir, "/log", NULL);
amfree(conf_logdir);
logfd = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0600);
if(logfd == -1) {
- error("could not open log file %s: %s", logfile, strerror(errno));
+ error(_("could not open log file %s: %s"), logfile, strerror(errno));
/*NOTREACHED*/
}
if(amflock(logfd, "log") == -1) {
- error("could not lock log file %s: %s", logfile, strerror(errno));
+ error(_("could not lock log file %s: %s"), logfile, strerror(errno));
/*NOTREACHED*/
}
}
close_log(void)
{
if(amfunlock(logfd, "log") == -1) {
- error("could not unlock log file %s: %s", logfile, strerror(errno));
+ error(_("could not unlock log file %s: %s"), logfile, strerror(errno));
/*NOTREACHED*/
}
if(close(logfd) == -1) {
- error("close log file: %s", strerror(errno));
+ error(_("close log file: %s"), strerror(errno));
/*NOTREACHED*/
}
amfree(logfile);
}
-
+/* WARNING: Function accesses globals curstr, curlog, and curprog
+ * WARNING: Function has static member logline, returned via globals */
int
get_logline(
FILE * logf)