summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2013-07-18 21:50:51 -0700
committerGreg Farnum <greg@inktank.com>2013-07-19 13:21:49 -0700
commit0024e5aa2240c37da11488264d03b52dbe8b9cab (patch)
tree61adaf64654c4f6b36298faf9799d4a8a589d113
parent7cd0bd85d458b2cf8f48036362890cf3b22895b3 (diff)
downloadceph-0024e5aa2240c37da11488264d03b52dbe8b9cab.tar.gz
rgw: fix time parsing in replica log
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
-rw-r--r--src/rgw/rgw_rest_replica_log.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rgw/rgw_rest_replica_log.cc b/src/rgw/rgw_rest_replica_log.cc
index 863a979a22e..600a8edb78c 100644
--- a/src/rgw/rgw_rest_replica_log.cc
+++ b/src/rgw/rgw_rest_replica_log.cc
@@ -27,13 +27,13 @@
#define REPLICA_INPUT_MAX_LEN (512*1024)
static int parse_to_utime(string& in, utime_t& out) {
- struct tm tm;
-
- if (!parse_iso8601(in.c_str(), &tm))
- return -EINVAL;
+ uint64_t sec = 0;
+ uint64_t nsec = 0;
+ int ret = utime_t::parse_date(in.c_str(), &sec, &nsec);
+ if (ret < 0)
+ return ret;
- time_t tt = mktime(&tm);
- out = utime_t(tt, 0);
+ out = utime_t(sec, nsec);
return 0;
}