c61cd050f9
The time logged is currently given as localtime without any timezone information. This is confusing in various scenarios. Examples: * If one is travelling across time-zones and the timestamps in the log appear out of order. * Comparing dates with `datediff` gives an offset by the time-zone This patch would reformat the time-stamp to a full ISO-8601 version. It includes the 'T' separating date and time including seconds. Old: [2019-03-04 16:15] New: [2019-03-04T16:15:45-05:00] Signed-off-by: Florian Wehner <florian@whnr.de> Signed-off-by: Allan McRae <allan@archlinux.org>
125 lines
3.2 KiB
C
125 lines
3.2 KiB
C
/*
|
|
* log.c
|
|
*
|
|
* Copyright (c) 2006-2018 Pacman Development Team <pacman-dev@archlinux.org>
|
|
* Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <errno.h>
|
|
#include <syslog.h>
|
|
#include <time.h>
|
|
|
|
/* libalpm */
|
|
#include "log.h"
|
|
#include "handle.h"
|
|
#include "util.h"
|
|
#include "alpm.h"
|
|
|
|
/** \addtogroup alpm_log Logging Functions
|
|
* @brief Functions to log using libalpm
|
|
* @{
|
|
*/
|
|
|
|
static int _alpm_log_leader(FILE *f, const char *prefix)
|
|
{
|
|
time_t t = time(NULL);
|
|
struct tm *tm = localtime(&t);
|
|
int length = 32;
|
|
char timestamp[length];
|
|
|
|
/* Use ISO-8601 date format */
|
|
strftime(timestamp,length,"%FT%X%z", tm);
|
|
return fprintf(f, "[%s] [%s] ", timestamp, prefix);
|
|
}
|
|
|
|
/** A printf-like function for logging.
|
|
* @param handle the context handle
|
|
* @param prefix caller-specific prefix for the log
|
|
* @param fmt output format
|
|
* @return 0 on success, -1 on error (pm_errno is set accordingly)
|
|
*/
|
|
int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix,
|
|
const char *fmt, ...)
|
|
{
|
|
int ret = 0;
|
|
va_list args;
|
|
|
|
ASSERT(handle != NULL, return -1);
|
|
|
|
if(!(prefix && *prefix)) {
|
|
prefix = "UNKNOWN";
|
|
}
|
|
|
|
/* check if the logstream is open already, opening it if needed */
|
|
if(handle->logstream == NULL && handle->logfile != NULL) {
|
|
int fd;
|
|
do {
|
|
fd = open(handle->logfile, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC,
|
|
0644);
|
|
} while(fd == -1 && errno == EINTR);
|
|
/* if we couldn't open it, we have an issue */
|
|
if(fd < 0 || (handle->logstream = fdopen(fd, "a")) == NULL) {
|
|
if(errno == EACCES) {
|
|
handle->pm_errno = ALPM_ERR_BADPERMS;
|
|
} else if(errno == ENOENT) {
|
|
handle->pm_errno = ALPM_ERR_NOT_A_DIR;
|
|
} else {
|
|
handle->pm_errno = ALPM_ERR_SYSTEM;
|
|
}
|
|
ret = -1;
|
|
}
|
|
}
|
|
|
|
va_start(args, fmt);
|
|
|
|
if(handle->usesyslog) {
|
|
/* we can't use a va_list more than once, so we need to copy it
|
|
* so we can use the original when calling vfprintf below. */
|
|
va_list args_syslog;
|
|
va_copy(args_syslog, args);
|
|
vsyslog(LOG_WARNING, fmt, args_syslog);
|
|
va_end(args_syslog);
|
|
}
|
|
|
|
if(handle->logstream) {
|
|
if(_alpm_log_leader(handle->logstream, prefix) < 0
|
|
|| vfprintf(handle->logstream, fmt, args) < 0) {
|
|
ret = -1;
|
|
handle->pm_errno = ALPM_ERR_SYSTEM;
|
|
}
|
|
fflush(handle->logstream);
|
|
}
|
|
|
|
va_end(args);
|
|
return ret;
|
|
}
|
|
|
|
/** @} */
|
|
|
|
void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, const char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
|
|
if(handle == NULL || handle->logcb == NULL) {
|
|
return;
|
|
}
|
|
|
|
va_start(args, fmt);
|
|
handle->logcb(flag, fmt, args);
|
|
va_end(args);
|
|
}
|