From: Sage Weil <sage@newdream.net>
Date: Mon, 20 Apr 2009 22:54:49 +0000 (-0700)
Subject: trivial cleanups
X-Git-Tag: v0.7.3~91
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96dd4b3937e5e50f48a1d39aacd488dc9473a85e;p=ceph.git

trivial cleanups
---

diff --git a/src/init-ceph b/src/init-ceph
index 29fcbb3a21c..4b5572b15eb 100755
--- a/src/init-ceph
+++ b/src/init-ceph
@@ -213,15 +213,17 @@ for name in $what; do
 	    ;;
 
 	cleanlogs)
+	    echo removing logs
 	    get_conf log_dir "/var/log/ceph" "log dir"
 	    get_conf log_sym_dir "/var/log/ceph" "log sym dir"
 	    do_cmd "for f in $log_sym_dir/$name*; do rm -f \`readlink \$f\` ; rm -f \$f ; done"
 	    ;;
 
 	cleanalllogs)
+	    echo removing all logs
 	    get_conf log_dir "/var/log/ceph" "log dir"
 	    get_conf log_sym_dir "/var/log/ceph" "log sym dir"
-	    do_cmd "rm -f $log_dir/* $log_sym_dir/*"
+	    do_cmd "rm -f $log_dir/* $log_sym_dir/* || true"
 	    ;;
 
 	*)
diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h
index ba825a8a2ce..c077aff50b9 100644
--- a/src/messages/MClientRequest.h
+++ b/src/messages/MClientRequest.h
@@ -183,7 +183,7 @@ public:
     if (!get_filepath2().empty())
       out << " " << get_filepath2();
     if (head.num_retry)
-      out << " RETRY=" << head.num_retry;
+      out << " RETRY=" << (int)head.num_retry;
     out << ")";
   }