Fix file crash errors

app/config.py

@@ -7,9 +7,9 @@
 
 
 create_game_groups = not os.path.isfile('../data/groups.json')
-number_of_groups = 2  # 8
+number_of_groups = 1  # 8
 
 create_game_matches = not os.path.isfile('../data/matches.json')
-matching_strategy = 'random'
-# matching_strategy = 'full'
-random_matching_matches_per_team = 1000 # None
+# matching_strategy = 'random'
+matching_strategy = 'full'
+random_matching_matches_per_team = 1 # None

app/main.py

@@ -52,6 +52,7 @@ def heartbeat():
     normalized_teams = [x.__dict__ for x in teams]
     normalized_matches = [x.__dict__ for x in matches]
     normalized_groups = groups
+    save_all_matches(matches)
     return json_response({
         'teams': normalized_teams,
         'groups': normalized_groups,

app/match.py

@@ -3,9 +3,12 @@
 from logs import log
 from lock import lock_matches, unlock_matches
 from random import random
+import shutil
+import os
 
 
 _last_backup = 0
+_matches = []
 
 
 class Match:
@@ -37,41 +40,69 @@ def unassign(self):
         self.start_time = None
 
     def is_expired(self):
-        return self.start_time is not None and int(time.time()) - self.start_time >= 20 * 60
+        return self.status == self.IN_PROGRESS and self.start_time is not None and int(time.time()) - self.start_time >= 20 * 60
 
 
 def save_all_matches(matches, lock=True):
     global _last_backup
-    if lock:
-        lock_matches()
-    try:
-        normalized_matches = [match.__dict__ for match in matches]
-        if time.time() - _last_backup >= 60:
-            with open('../data/matches_backup.json', 'w') as f:
-                f.write(json.dumps(normalized_matches))
-            _last_backup = time.time()
+    global _matches
+    normalized_matches = [match.__dict__ for match in matches]
+    if time.time() - _last_backup >= 60:
         with open('../data/matches.json', 'w') as f:
             f.write(json.dumps(normalized_matches))
-        time.sleep(random()/8)
-    except Exception:
-        pass
-    if lock:
-        unlock_matches()
+        _last_backup = time.time()
+    _matches = matches
+    # if lock:
+    #     lock_matches()
+    # try:
+    #     normalized_matches = [match.__dict__ for match in matches]
+    #     if time.time() - _last_backup >= 60:
+    #         with open('../data/matches_backup.json', 'w') as f:
+    #             f.write(json.dumps(normalized_matches))
+    #         _last_backup = time.time()
+    #     with open('../data/matches.json', 'w') as f:
+    #         f.write(json.dumps(normalized_matches))
+    #     time.sleep(random()/8)
+    # except Exception:
+    #     pass
+    # if lock:
+    #     unlock_matches()
 
 
 def load_matches(lock=True):
-    if lock:
-        lock_matches()
-    result = []
+    global _matches
+    if len(_matches) > 0:
+        return _matches
     try:
         with open('../data/matches.json', 'r') as f:
             raw_matches = json.loads(f.read())
-        result = [Match.from_dict(raw_match) for raw_match in raw_matches]
-    except Exception:
+        _matches = [Match.from_dict(raw_match) for raw_match in raw_matches]
+    except Exception as e:
         log('Unable to load the matches from json file')
-    if lock:
-        unlock_matches()
-    return result
+        log(str(e))
+    return _matches
+    # if lock:
+    #     lock_matches()
+    # result = []
+    # restored = 0
+    # while restored < 2:
+    #     try:
+    #         with open('../data/matches.json', 'r') as f:
+    #             raw_matches = json.loads(f.read())
+    #         result = [Match.from_dict(raw_match) for raw_match in raw_matches]
+    #         break
+    #     except Exception as e:
+    #         log('Unable to load the matches from json file')
+    #         log(str(e))
+    #         try:
+    #             restore_matches()
+    #         except Exception as ee:
+    #             log('Failed to restore matches')
+    #             log(str(ee))
+    #         restored += 1
+    # if lock:
+    #     unlock_matches()
+    # return result
 
 
 def unassign_all_expired_matches(matches, lock=True):
@@ -82,3 +113,9 @@ def unassign_all_expired_matches(matches, lock=True):
             match.unassign()
     if found_any:
         save_all_matches(matches, lock)
+
+
+def restore_matches():
+    if os.path.isfile('../data/matches.json'):
+        os.remove('../data/matches.json')
+    shutil.copyfile('../data/matches_backup.json', '../data/matches.json')

uwsgi.ini

@@ -2,4 +2,6 @@
 module = main
 callable = app
 master = true
-touch-reload = /app/uwsgi.ini
+touch-reload = /app/uwsgi.ini
+processes = 1
+cheaper = 0