106 lines
3.6 KiB
Diff
106 lines
3.6 KiB
Diff
From 2295b08d4f19b650abc7a14436a486715a913d1c Mon Sep 17 00:00:00 2001
|
|
From: Richard Hughes <richard@hughsie.com>
|
|
Date: Wed, 4 Dec 2013 13:57:59 +0000
|
|
Subject: [PATCH 22/50] Use syslog() correctly
|
|
|
|
Resolves: https://bugs.freedesktop.org/show_bug.cgi?id=72275
|
|
---
|
|
src/pk-main.c | 4 ++--
|
|
src/pk-transaction.c | 16 +++++++++-------
|
|
2 files changed, 11 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/pk-main.c b/src/pk-main.c
|
|
index 3ce5694..457a511 100644
|
|
--- a/src/pk-main.c
|
|
+++ b/src/pk-main.c
|
|
@@ -241,7 +241,7 @@ main (int argc, char *argv[])
|
|
pk_conf_set_bool (conf, "KeepEnvironment", keep_environment);
|
|
|
|
/* log the startup */
|
|
- syslog (LOG_DAEMON, "daemon start");
|
|
+ syslog (LOG_DAEMON | LOG_DEBUG, "daemon start");
|
|
|
|
/* after how long do we timeout? */
|
|
exit_idle_time = pk_conf_get_int (conf, "ShutdownTimeout");
|
|
@@ -309,7 +309,7 @@ main (int argc, char *argv[])
|
|
g_main_loop_run (loop);
|
|
out:
|
|
/* log the shutdown */
|
|
- syslog (LOG_DAEMON, "daemon quit");
|
|
+ syslog (LOG_DAEMON | LOG_DEBUG, "daemon quit");
|
|
closelog ();
|
|
|
|
if (timer_id > 0)
|
|
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
|
|
index 9e741f7..6471d1b 100644
|
|
--- a/src/pk-transaction.c
|
|
+++ b/src/pk-transaction.c
|
|
@@ -1246,7 +1246,7 @@ pk_transaction_finished_cb (PkBackendJob *job, PkExitEnum exit_enum, PkTransacti
|
|
if (info == PK_INFO_ENUM_REMOVING ||
|
|
info == PK_INFO_ENUM_INSTALLING ||
|
|
info == PK_INFO_ENUM_UPDATING) {
|
|
- syslog (LOG_DAEMON,
|
|
+ syslog (LOG_DAEMON | LOG_DEBUG,
|
|
"in %s for %s package %s was %s for uid %i",
|
|
transaction->priv->tid,
|
|
pk_role_enum_to_string (transaction->priv->role),
|
|
@@ -1281,7 +1281,7 @@ pk_transaction_finished_cb (PkBackendJob *job, PkExitEnum exit_enum, PkTransacti
|
|
|
|
/* report to syslog */
|
|
if (transaction->priv->uid != PK_TRANSACTION_UID_INVALID) {
|
|
- syslog (LOG_DAEMON,
|
|
+ syslog (LOG_DAEMON | LOG_INFO,
|
|
"%s transaction %s from uid %i finished with %s after %ims",
|
|
pk_role_enum_to_string (transaction->priv->role),
|
|
transaction->priv->tid,
|
|
@@ -1289,7 +1289,7 @@ pk_transaction_finished_cb (PkBackendJob *job, PkExitEnum exit_enum, PkTransacti
|
|
pk_exit_enum_to_string (exit_enum),
|
|
time_ms);
|
|
} else {
|
|
- syslog (LOG_DAEMON,
|
|
+ syslog (LOG_DAEMON | LOG_INFO,
|
|
"%s transaction %s finished with %s after %ims",
|
|
pk_role_enum_to_string (transaction->priv->role),
|
|
transaction->priv->tid,
|
|
@@ -2473,7 +2473,7 @@ pk_transaction_commit (PkTransaction *transaction)
|
|
pk_transaction_db_set_cmdline (priv->transaction_db, priv->tid, priv->cmdline);
|
|
|
|
/* report to syslog */
|
|
- syslog (LOG_DAEMON,
|
|
+ syslog (LOG_DAEMON | LOG_DEBUG,
|
|
"new %s transaction %s scheduled from uid %i",
|
|
pk_role_enum_to_string (priv->role),
|
|
priv->tid,
|
|
@@ -2664,7 +2664,9 @@ pk_transaction_action_obtain_authorization_finished_cb (GObject *source_object,
|
|
"Failed to obtain authentication.");
|
|
pk_transaction_finished_emit (transaction, PK_EXIT_ENUM_FAILED, 0);
|
|
|
|
- syslog (LOG_AUTHPRIV, "uid %i failed to obtain auth", priv->uid);
|
|
+ syslog (LOG_AUTH | LOG_NOTICE,
|
|
+ "uid %i failed to obtain auth",
|
|
+ priv->uid);
|
|
goto out;
|
|
}
|
|
|
|
@@ -2677,7 +2679,7 @@ pk_transaction_action_obtain_authorization_finished_cb (GObject *source_object,
|
|
}
|
|
|
|
/* log success too */
|
|
- syslog (LOG_AUTHPRIV, "uid %i obtained auth", priv->uid);
|
|
+ syslog (LOG_AUTH | LOG_INFO, "uid %i obtained auth", priv->uid);
|
|
out:
|
|
if (result != NULL)
|
|
g_object_unref (result);
|
|
@@ -2876,7 +2878,7 @@ pk_transaction_obtain_authorization (PkTransaction *transaction,
|
|
}
|
|
|
|
/* log */
|
|
- syslog (LOG_AUTHPRIV,
|
|
+ syslog (LOG_AUTH | LOG_INFO,
|
|
"uid %i is trying to obtain %s auth (only_trusted:%i)",
|
|
priv->uid,
|
|
action_id,
|
|
--
|
|
1.8.4.2
|
|
|