From c08f52a53901cda1082a010cb2d6b013f3ae50a4 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Tue, 29 Jan 2008 16:14:04 -0500 Subject: add a helper to write a system start record to the CK history --- src/ck-log-event.c | 2 +- tools/Makefile.am | 13 ++++ tools/ck-log-system-start.c | 174 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 tools/ck-log-system-start.c diff --git a/src/ck-log-event.c b/src/ck-log-event.c index 172776e..f099b89 100644 --- a/src/ck-log-event.c +++ b/src/ck-log-event.c @@ -465,7 +465,7 @@ add_log_for_system_restart (GString *str, static void add_log_for_system_start (GString *str, - CkLogEvent *event) + CkLogEvent *event) { CkLogSystemStartEvent *e; diff --git a/tools/Makefile.am b/tools/Makefile.am index dd3fbd7..bf6a4ae 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -48,6 +48,10 @@ bin_PROGRAMS = \ ck-history \ $(NULL) +sbin_PROGRAMS = \ + ck-log-system-start \ + $(NULL) + ck_list_sessions_SOURCES = \ list-sessions.c \ $(NULL) @@ -66,6 +70,15 @@ ck_history_LDADD = \ $(top_builddir)/src/libck-event-log.la \ $(NULL) +ck_log_system_start_SOURCES = \ + ck-log-system-start.c \ + $(NULL) + +ck_log_system_start_LDADD = \ + $(HISTORY_LIBS) \ + $(top_builddir)/src/libck-event-log.la \ + $(NULL) + libexec_PROGRAMS = \ ck-collect-session-info \ ck-get-x11-server-pid \ diff --git a/tools/ck-log-system-start.c b/tools/ck-log-system-start.c new file mode 100644 index 0000000..4afdfa0 --- /dev/null +++ b/tools/ck-log-system-start.c @@ -0,0 +1,174 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2008 William Jon McCann + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + * + */ + +#include "config.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include "ck-log-event.h" + +#define DEFAULT_LOG_FILENAME LOCALSTATEDIR "/log/ConsoleKit/history" + + +/* Adapted from auditd auditd-event.c */ +static gboolean +open_log_file (const char *filename, + int *fdp, + FILE **filep) +{ + int flags; + int fd; + FILE *file; + gboolean ret; + + ret = FALSE; + + /* + * Likely errors on rotate: ENFILE, ENOMEM, ENOSPC + */ + flags = O_WRONLY | O_APPEND; +#ifdef O_NOFOLLOW + flags |= O_NOFOLLOW; +#endif + +retry: + fd = g_open (filename, flags, 0600); + if (fd < 0) { + if (errno == ENOENT) { + /* FIXME: should we just skip if file doesn't exist? */ + fd = g_open (filename, + O_CREAT | O_EXCL | O_APPEND, + S_IRUSR | S_IWUSR | S_IRGRP); + if (fd < 0) { + g_warning ("Couldn't create log file %s (%s)", + filename, + g_strerror (errno)); + goto out; + } + + close (fd); + fd = g_open (filename, flags, 0600); + } else if (errno == ENFILE) { + /* All system descriptors used, try again... */ + goto retry; + } + if (fd < 0) { + g_warning ("Couldn't open log file %s (%s)", + filename, + g_strerror (errno)); + goto out; + } + } + + if (fcntl (fd, F_SETFD, FD_CLOEXEC) == -1) { + close (fd); + g_warning ("Error setting log file CLOEXEC flag (%s)", + g_strerror (errno)); + goto out; + } + + fchown (fd, 0, 0); + + file = fdopen (fd, "a"); + if (file == NULL) { + g_warning ("Error setting up log descriptor (%s)", + g_strerror (errno)); + close (fd); + goto out; + } + + /* Set it to line buffering */ + setlinebuf (file); + + ret = TRUE; + + if (fdp != NULL) { + *fdp = fd; + } + if (filep != NULL) { + *filep = file; + } + + out: + + return ret; +} + +static gboolean +write_log_for_event (CkLogEvent *event) +{ + GString *str; + FILE *file; + int fd; + + str = g_string_new (NULL); + + ck_log_event_to_string (event, str); + + if (! open_log_file (DEFAULT_LOG_FILENAME, &fd, &file)) { + exit (1); + } + + if (file != NULL) { + int rc; + + rc = fprintf (file, "%s\n", str->str); + if (rc <= 0) { + g_warning ("Record was not written to disk (%s)", + g_strerror (errno)); + } + } else { + g_warning ("Log file not open for writing"); + } + + g_string_free (str, TRUE); + + return TRUE; +} + +int +main (int argc, + char **argv) +{ + CkLogEvent event; + + memset (&event, 0, sizeof (CkLogEvent)); + + event.type = CK_LOG_EVENT_SYSTEM_START; + g_get_current_time (&event.timestamp); + + write_log_for_event (&event); + + return 0; +} -- cgit