do not give up early when trying to push

fossasia · Oct 30, 2018 · 34b6981 · 34b6981
1 parent dea2698
commit 34b6981
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/ai/susi/DAO.java b/src/ai/susi/DAO.java
@@ -468,6 +468,9 @@ public static void close() {
         passwordreset.close();
         accounting.close();
 
+        // close pull thread
+        SkillTransactions.close();
+
         log("closed DAO");
     }
 

diff --git a/src/ai/susi/SkillTransactions.java b/src/ai/susi/SkillTransactions.java
@@ -43,9 +43,10 @@
 
 public class SkillTransactions {
 
-    public static Boolean pullStatus = true;
-    public static String conflictsPlaceholder = "%CONFLICTS%";
+    private static Boolean pullStatus = true;
+    public  static String conflictsPlaceholder = "%CONFLICTS%";
     private static ConcurrentLinkedDeque<CommitAction> pushQueue = new ConcurrentLinkedDeque<>();
+    private static Thread pullThread;
 
     /**
      * initialize the DAO
@@ -55,7 +56,7 @@ public class SkillTransactions {
     public static void init(long pull_delay) throws Exception{
 
         DAO.log("Starting Skill Data pull thread");
-        Thread pullThread = new Thread() {
+        pullThread = new Thread() {
             @Override
             public void run() {
                 while (pullStatus) {
@@ -64,22 +65,26 @@ public void run() {
                     } catch (InterruptedException e) {
                         break;
                     }
-                    while (pushQueue.size() > 0) {
-                        CommitAction ca = pushQueue.removeFirst();
-                        ca.process();
-                    }
                     try {
                         pull(getPublicGit());
                     } catch (Exception e) {
-                        pullStatus = false;
                         DAO.severe("SKILL PULL THREAD", e);
                     }
+                    while (pushQueue.size() > 0) {
+                        CommitAction ca = pushQueue.removeFirst();
+                        ca.process();
+                    }
                 }
             }
         };
         pullThread.start();
     }
 
+    public static void close() {
+        pullStatus = false;
+        pullThread.interrupt();
+    }
+
     public static Repository getPublicRepository() throws IOException {
       Repository repo;
       File repoFile = DAO.susi_skill_repo;
@@ -143,7 +148,6 @@ public static void pull(Git git) throws IOException {
             MergeResult mergeResult = pullResult.getMergeResult();
 
             if (mergeResult!=null && mergeResult.getConflicts()!=null) {
-                pullStatus =false;
                 // we have conflicts send email to admin
                 try {
                     EmailHandler.sendEmail(DAO.getConfig("skill_repo.admin_email",""), "SUSI Skill Data Conflicts", getConflictsMailContent(mergeResult));