From 96dd4b3937e5e50f48a1d39aacd488dc9473a85e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 20 Apr 2009 15:54:49 -0700 Subject: [PATCH] trivial cleanups --- src/init-ceph | 4 +++- src/messages/MClientRequest.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/init-ceph b/src/init-ceph index 29fcbb3a21cc9..4b5572b15eba4 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 ba825a8a2ce13..c077aff50b948 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 << ")"; } -- 2.39.5