diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2016-05-05 11:35:46 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2016-05-10 01:43:14 +0200 |
| commit | bcace463b97b0a6737dded4a6d45996923ff0057 (patch) | |
| tree | 91a7e3a2bee0cc5b4751053e85e59237632439cb /source4/smbd | |
| parent | 9084dae5aaa343770614d6923e0c572bd0e26b8e (diff) | |
| download | samba-bcace463b97b0a6737dded4a6d45996923ff0057.tar.gz | |
selftest: Include a few more details in selftest and samba startup.
This helps us understand failure modes in selftest
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/server.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source4/smbd/server.c b/source4/smbd/server.c index bd70ac658ad..c82362e00b3 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -162,7 +162,7 @@ static void server_stdin_handler(struct tevent_context *event_ctx, struct tevent const char *binary_name = (const char *)private_data; uint8_t c; if (read(0, &c, 1) == 0) { - DEBUG(0,("%s: EOF on stdin - terminating\n", binary_name)); + DEBUG(0,("%s: EOF on stdin - PID %d terminating\n", binary_name, (int)getpid())); #if HAVE_GETPGRP if (getpgrp() == getpid()) { DEBUG(0,("Sending SIGTERM from pid %d\n", (int)getpid())); @@ -181,8 +181,8 @@ _NORETURN_ static void max_runtime_handler(struct tevent_context *ev, struct timeval t, void *private_data) { const char *binary_name = (const char *)private_data; - DEBUG(0,("%s: maximum runtime exceeded - terminating at %llu, current ts: %llu\n", - binary_name, (unsigned long long)t.tv_sec, (unsigned long long) time(NULL))); + DEBUG(0,("%s: maximum runtime exceeded - terminating PID %d at %llu, current ts: %llu\n", + binary_name, (int)getpid(), (unsigned long long)t.tv_sec, (unsigned long long) time(NULL))); exit(0); } @@ -209,7 +209,8 @@ static void prime_ldb_databases(struct tevent_context *event_ctx) static NTSTATUS samba_terminate(struct irpc_message *msg, struct samba_terminate *r) { - DEBUG(0,("samba_terminate: %s\n", r->in.reason)); + DEBUG(0,("samba_terminate of %d: %s\n", + (int)getpid(), r->in.reason)); exit(1); } @@ -456,8 +457,9 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ } if (max_runtime) { - DEBUG(0,("Called with maxruntime %d - current ts %llu\n", - max_runtime, (unsigned long long) time(NULL))); + DEBUG(0,("%s PID %d was called with maxruntime %d - current ts %llu\n", + binary_name, (int)getpid(), + max_runtime, (unsigned long long) time(NULL))); tevent_add_timer(event_ctx, event_ctx, timeval_current_ofs(max_runtime, 0), max_runtime_handler, |