trivial cleanups

diff --git a/src/init-ceph b/src/init-ceph
index 29fcbb3a21cc933ea940df7fd5311d75e699b594..4b5572b15eba4a362d30457788b51a2a990e2f4d 100755 (executable)
--- 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 ba825a8a2ce1368e8a315ac83837af8c78353313..c077aff50b9480f87cb8a8fe102c3fde95f8bae0 100644 (file)
--- 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 << ")";
   }