summaryrefslogtreecommitdiffstats
path: root/ctdb/include
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2014-08-08 20:57:05 +1000
committerAmitay Isaacs <amitay@samba.org>2014-10-28 05:42:04 +0100
commit29745543566ef66c1f2972fd5cd68e17ddf4de4f (patch)
tree154c236c599b6c0ffc98eb33a6f47d79cdb8377b /ctdb/include
parent38c8e15690331c4798f9caf3be6a44251d3db809 (diff)
downloadsamba-29745543566ef66c1f2972fd5cd68e17ddf4de4f.tar.gz
samba-29745543566ef66c1f2972fd5cd68e17ddf4de4f.tar.xz
samba-29745543566ef66c1f2972fd5cd68e17ddf4de4f.zip
ctdb-logging: Replace logd code with a basic syslog(3) implementation
It is much simpler for most cases to have a syslog backend that doesn't need a separate CTDB-specific logging daemon. This loses the lossy, non-blocking mode provided by logd. However, a corresponding feature with a completely different implemention (not requiring an extra daemon) will be re-added into the syslog backend. In an ideal world the new implementation would be added first but unfortunately that is hard to do because the logd code is hooked in at more than one place. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/include')
-rw-r--r--ctdb/include/ctdb_private.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 7d454cec5e..3d6f487ff5 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -514,7 +514,6 @@ struct ctdb_context {
const char *default_public_interface;
pid_t ctdbd_pid;
pid_t recoverd_pid;
- pid_t syslogd_pid;
enum ctdb_runstate runstate;
struct ctdb_monitor_state *monitor;
int start_as_disabled;
@@ -775,8 +774,8 @@ struct ctdb_call_state *ctdb_call_local_send(struct ctdb_db_context *ctdb_db,
TDB_DATA *data);
-int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork,
- bool use_syslog);
+int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork);
+
struct ctdb_call_state *ctdbd_call_send(struct ctdb_db_context *ctdb_db, struct ctdb_call *call);
int ctdbd_call_recv(struct ctdb_call_state *state, struct ctdb_call *call);
@@ -1448,7 +1447,6 @@ int32_t ctdb_control_register_notify(struct ctdb_context *ctdb, uint32_t client_
int32_t ctdb_control_deregister_notify(struct ctdb_context *ctdb, uint32_t client_id, TDB_DATA indata);
-int start_syslog_daemon(struct ctdb_context *ctdb);
struct ctdb_log_state *ctdb_vfork_with_logging(TALLOC_CTX *mem_ctx,
struct ctdb_context *ctdb,
const char *log_prefix,