From owner-svn-src-all@FreeBSD.ORG  Mon Mar 21 08:33:58 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A9120106564A;
	Mon, 21 Mar 2011 08:33:58 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 97CCB8FC0C;
	Mon, 21 Mar 2011 08:33:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2L8XwLq004804;
	Mon, 21 Mar 2011 08:33:58 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2L8Xw6w004802;
	Mon, 21 Mar 2011 08:33:58 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201103210833.p2L8Xw6w004802@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Mon, 21 Mar 2011 08:33:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219814 - head/sbin/hastd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Mar 2011 08:33:58 -0000

Author: pjd
Date: Mon Mar 21 08:33:58 2011
New Revision: 219814
URL: http://svn.freebsd.org/changeset/base/219814

Log:
  When creating connection on behalf of primary worker, set pjdlog prefix
  to resource name and role, so that any logs related to that can be identified
  properly.
  
  MFC after:	1 week

Modified:
  head/sbin/hastd/hastd.c

Modified: head/sbin/hastd/hastd.c
==============================================================================
--- head/sbin/hastd/hastd.c	Mon Mar 21 08:31:35 2011	(r219813)
+++ head/sbin/hastd/hastd.c	Mon Mar 21 08:33:58 2011	(r219814)
@@ -842,6 +842,8 @@ connection_migrate(struct hast_resource 
 	struct proto_conn *conn;
 	int16_t val = 0;
 
+	pjdlog_prefix_set("[%s] (%s) ", res->hr_name, role2str(res->hr_role));
+
 	if (proto_recv(res->hr_conn, &val, sizeof(val)) < 0) {
 		pjdlog_errno(LOG_WARNING,
 		    "Unable to receive connection command");
@@ -869,6 +871,8 @@ out:
 	}
 	if (val == 0 && proto_connection_send(res->hr_conn, conn) < 0)
 		pjdlog_errno(LOG_WARNING, "Unable to send connection");
+
+	pjdlog_prefix_set("%s", "");
 }
 
 static void