shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-06 16:59:03 +03:00
Code

journal: timestamp support on console messages

Browse Source 
journald mimics the kernel here: timestamps will be printed if
/sys/module/printk/parameters/time contains "Y".
This commit is contained in:
Umut Tezduyar Lindskog 2013-11-13 15:27:19 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent 4555ec72d6
commit ad79565d6b
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/journal/journald-console.c
View File

@ -19,13 +19,30 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <time.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/socket.h>
#include "fileio.h"
#include "journald-server.h"
#include "journald-console.h"
static bool prefix_timestamp(void) {
static int cached_printk_time = -1;
if (_unlikely_(cached_printk_time < 0)) {
_cleanup_free_ char *p = NULL;
cached_printk_time =
read_one_line_file("/sys/module/printk/parameters/time", &p) >= 0
&& parse_boolean(p) > 0;
}
return cached_printk_time;
}
void server_forward_console(
Server *s,
int priority,
@ -33,8 +50,10 @@ void server_forward_console(
const char *message,
struct ucred *ucred) {
struct iovec iovec[4];
struct iovec iovec[5];
char header_pid[16];
struct timespec ts;
char tbuf[4 + DECIMAL_STR_MAX(ts.tv_sec) + DECIMAL_STR_MAX(ts.tv_nsec)-3 + 1];
int n = 0, fd;
char *ident_buf = NULL;
const char *tty;
@ -45,7 +64,16 @@ void server_forward_console(
if (LOG_PRI(priority) > s->max_level_console)
return;
/* First: identifier and PID */
/* First: timestamp */
if (prefix_timestamp()) {
assert_se(clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
snprintf(tbuf, sizeof(tbuf), "[%5llu.%06llu] ",
(unsigned long long) ts.tv_sec,
(unsigned long long) ts.tv_nsec / 1000);
IOVEC_SET_STRING(iovec[n++], tbuf);
}
/* Second: identifier and PID */
if (ucred) {
if (!identifier) {
get_process_comm(ucred->pid, &ident_buf);
@ -64,7 +92,7 @@ void server_forward_console(
IOVEC_SET_STRING(iovec[n++], ": ");
}
/* Third: message */
/* Fourth: message */
IOVEC_SET_STRING(iovec[n++], message);
IOVEC_SET_STRING(iovec[n++], "\n");