EXT-323 Automatic snapshots app

Fixed weekly cron-expression
enonic · Feb 14, 2017 · 7f7bb0e · 7f7bb0e
1 parent 11e85f4
commit 7f7bb0e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,4 +6,4 @@ projectName = snapshotter
 appName = com.enonic.app.snapshotter
 displayName = Snapshotter
 xpVersion = 6.9.1
-version = 1.0.2
+version = 1.0.3
diff --git a/src/main/java/com/enonic/app/snapshotter/scheduler/SchedulerImpl.java b/src/main/java/com/enonic/app/snapshotter/scheduler/SchedulerImpl.java
@@ -26,7 +26,14 @@ public void schedule( final Job job )
         final Duration executionTime = job.nextExecutionTime();
         LOG.debug( "Scheduling job: " + job.description() + " in " + executionTime.toString() );
         final JobTask task = new JobTask( job.executor(), job, this );
-        this.timer.schedule( task, executionTime.toMillis() );
+        try
+        {
+            this.timer.schedule( task, executionTime.toMillis() );
+        }
+        catch ( final IllegalStateException e )
+        {
+            LOG.error( "Timer in invalid state, restart application to restore state" );
+        }
     }
 
     @Override

diff --git a/src/main/resources/admin/tools/snapshotter/snapshotter.js b/src/main/resources/admin/tools/snapshotter/snapshotter.js
@@ -9,11 +9,8 @@ exports.get = function (req) {
     var result = snapshotter.schedules();
 
     result.schedules.forEach(function (schedule) {
-
         var date = new Date(Date.parse(schedule.nextExecTime));
-
         schedule.readable = date.toLocaleDateString() + " " + date.toLocaleTimeString();
-
     });
 
     var model = {

diff --git a/src/main/resources/com/enonic/app/snapshotter/default.properties b/src/main/resources/com/enonic/app/snapshotter/default.properties
@@ -6,7 +6,7 @@ snapshot.daily.cron=0 1 * * *
 snapshot.daily.keep=P7D
 snapshot.daily.enabled=true
 
-snapshot.weekly.cron=* 4 * * 1
+snapshot.weekly.cron=0 4 * * 1
 snapshot.weekly.keep=P30D
 snapshot.weekly.enabled=true