Call setproctitle earlier in the client, and include the socket name. Makes it

easier to match client to server in ps/pgrep when using several servers.
This commit is contained in:
Nicholas Marriott 2009-06-25 15:58:33 +00:00
parent b9155e835a
commit 0e95769b43

View File

@ -1,4 +1,4 @@
/* $Id: client.c,v 1.48 2009-05-13 23:27:00 nicm Exp $ */ /* $OpenBSD: client.c,v 1.2 2009/06/05 07:15:58 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -46,6 +46,15 @@ client_init(char *path, struct client_ctx *cctx, int start_server, int flags)
int mode; int mode;
struct buffer *b; struct buffer *b;
char *name; char *name;
#ifdef HAVE_SETPROCTITLE
char rpathbuf[MAXPATHLEN];
#endif
#ifdef HAVE_SETPROCTITLE
if (realpath(path, rpathbuf) == NULL)
strlcpy(rpathbuf, path, sizeof rpathbuf);
setproctitle("client (%s)", rpathbuf);
#endif
if (lstat(path, &sb) != 0) { if (lstat(path, &sb) != 0) {
if (start_server && errno == ENOENT) { if (start_server && errno == ENOENT) {
@ -135,9 +144,6 @@ client_main(struct client_ctx *cctx)
siginit(); siginit();
logfile("client"); logfile("client");
#ifdef HAVE_SETPROCTITLE
setproctitle("client");
#endif
error = NULL; error = NULL;
xtimeout = INFTIM; xtimeout = INFTIM;