added archive_with_commit to cron page

added return callback to ensure no callback failure if two archives are made within the same second.
hexparrot · Aug 12, 2016 · ab13105 · ab13105
1 parent 14ec80e
commit ab13105
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/html/index.html b/html/index.html
@@ -1333,6 +1333,7 @@ <h4 class="title" translate="CRONTAB_SCHEDULE"></h4>
                                                                     <option translate="RESTART" value="restart"></option>
                                                                     <option translate="CREATE_NEW_RESTORE_POINT" value="backup"></option>
                                                                     <option translate="CREATE_NEW_ARCHIVE" value="archive"></option>
+                                                                    <option ng-show="current && servers[current].live_logs['logs/latest.log'].length" translate="COMMIT_THEN_CREATE_ARCHIVE" value="archive_with_commit"></option>
                                                                     <option translate="SEND_TO_CONSOLE" value="stuff"></option>
                                                                 </select>
                                                             </div>

diff --git a/mineos.js b/mineos.js
@@ -1470,23 +1470,23 @@ mineos.mc = function(server_name, base_dir) {
 
         var timeout = setTimeout(function(){
           new_tail.unwatch();
-          callback(null, true); //default to true for unsupported server functionality fallback
+          return callback(null, true); //default to true for unsupported server functionality fallback
         }, TIMEOUT_LENGTH);
 
         new_tail.on('line', function(data) {
           var match = data.match(/INFO]: Saving is already turned on/);
           if (match) { //previously on, return true
             clearTimeout(timeout);
             new_tail.unwatch();
-            callback(null, true);
+            return callback(null, true);
           }
           var match = data.match(/INFO]: Turned on world auto-saving/);
           if (match) { //previously off, return false
             clearTimeout(timeout);
             new_tail.unwatch();
 
             self.stuff('save-off', function() { //reset initial state
-              callback(null, false); //return initial state
+              return callback(null, false); //return initial state
             });
           }
         })