/*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#undef VLOG_FACILITY
};
-/* Time at which vlog was initialized, in milliseconds. */
-static long long int boot_time;
-
/* VLF_FILE configuration. */
static char *log_file_name;
static FILE *log_file;
openlog(program_name, LOG_NDELAY, LOG_DAEMON);
- boot_time = time_msec();
now = time_wall();
if (now < 0) {
struct tm tm;
break;
case 'd':
p = fetch_braces(p, "%Y-%m-%d %H:%M:%S", tmp, sizeof tmp);
- ds_put_strftime(s, tmp, NULL);
+ ds_put_strftime(s, tmp, false);
+ break;
+ case 'D':
+ p = fetch_braces(p, "%Y-%m-%d %H:%M:%S", tmp, sizeof tmp);
+ ds_put_strftime(s, tmp, true);
break;
case 'm':
/* Format user-supplied log message and trim trailing new-lines. */
ds_put_format(s, "%ld", (long int) getpid());
break;
case 'r':
- ds_put_format(s, "%lld", time_msec() - boot_time);
+ ds_put_format(s, "%lld", time_msec() - time_boot_msec());
break;
default:
ds_put_char(s, p[-1]);