dss-0.1.1.

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index af1326fd5ad4d7262814d85f3dbdb203c9736fb8..af02f1ce0bfcbf20b6858a3b22f762762140e4bf 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -502,6 +502,8 @@ static int handle_rsync_exit(int status)
                DSS_WARNING_LOG("rsync process %d returned %d -- restarting\n",
                        (int)rsync_pid, es);
                snapshot_creation_status = SCS_RSYNC_NEEDS_RESTART;
+               gettimeofday(&next_snapshot_time, NULL);
+               next_snapshot_time.tv_sec += 60;
                ret = 1;
                goto out;
        }
@@ -964,8 +966,12 @@ static int com_ls(void)
        struct snapshot *s;
 
        dss_get_snapshot_list(&sl);
-       FOR_EACH_SNAPSHOT(s, i, &sl)
-               dss_msg("%u\t%s\n", s->interval, s->name);
+       FOR_EACH_SNAPSHOT(s, i, &sl) {
+               int64_t d = 0;
+               if (s->flags & SS_COMPLETE)
+                       d = (s->completion_time - s->creation_time) / 60;
+               dss_msg("%u\t%s\t%3" PRId64 ":%02" PRId64 "\n", s->interval, s->name, d/60, d%60);
+       };
        free_snapshot_list(&sl);
        return 1;
 }