From: Andrew Deason <adeason@sinenomine.net>
Date: Wed, 4 Nov 2009 03:22:50 +0000 (-0600)
Subject: Cleanup VOffline log message
X-Git-Tag: openafs-devel-1_5_67~81
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=fd592c7674d4aa44dda90998b54d7b56947f6ed8;p=packages%2Fo%2Fopenafs.git

Cleanup VOffline log message

Make the 'Volume X (Y) is now offline' messages appear more sanely in
the log; logging as one line at once.

Change-Id: I8a3cf986fb30e292e509237357bd1039f2f181b9
Reviewed-on: http://gerrit.openafs.org/782
Tested-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/vol/volume.c b/src/vol/volume.c
index 313cb4256..4c4f00764 100644
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -3712,11 +3712,14 @@ VCheckOffline(register Volume * vp)
 	VCloseVolumeHandles_r(vp);
 
 	if (LogLevel) {
-	    Log("VOffline: Volume %u (%s) is now offline", V_id(vp),
-		V_name(vp));
-	    if (V_offlineMessage(vp)[0])
-		Log(" (%s)", V_offlineMessage(vp));
-	    Log("\n");
+	    if (V_offlineMessage(vp)[0]) {
+		Log("VOffline: Volume %lu (%s) is now offline (%s)\n",
+		    afs_printable_uint32_lu(V_id(vp)), V_name(vp),
+		    V_offlineMessage(vp));
+	    } else {
+		Log("VOffline: Volume %lu (%s) is now offline\n",
+		    afs_printable_uint32_lu(V_id(vp)), V_name(vp));
+	    }
 	}
 
 	/* invalidate the volume header cache entry */