clean up unneeded code in recover_offline (if this change is correct …

…,no functional change was made)
materialsproject · Jun 5, 2019 · 7da6227 · 7da6227
1 parent a28c6ec
commit 7da6227
Showing 1 changed file with 37 additions and 37 deletions.
diff --git a/fireworks/core/launchpad.py b/fireworks/core/launchpad.py
@@ -1685,44 +1685,44 @@ def recover_offline(self, launch_id, ignore_errors=False, print_errors=False):
             # look for action in FW_offline.json
             offline_loc = zpath(os.path.join(m_launch.launch_dir,
                                              "FW_offline.json"))
-            with zopen(offline_loc) as f:
-                offline_data = loadfn(offline_loc)
-                if 'started_on' in offline_data:
-                    m_launch.state = 'RUNNING'
-                    for s in m_launch.state_history:
-                        if s['state'] == 'RUNNING':
-                            s['created_on'] = reconstitute_dates(offline_data['started_on'])
-                    l = self.launches.find_one_and_replace({'launch_id': m_launch.launch_id},
-                                                           m_launch.to_db_dict(), upsert=True)
-                    fw_id = l['fw_id']
-                    f = self.fireworks.find_one_and_update({'fw_id': fw_id},
-                                                           {'$set':
-                                                                {'state': 'RUNNING',
-                                                                 'updated_on': datetime.datetime.utcnow()
-                                                                 }
-                                                            })
-                    if f:
-                        self._refresh_wf(fw_id)
-
-                if 'checkpoint' in offline_data:
-                    m_launch.touch_history(checkpoint=offline_data['checkpoint'])
-                    self.launches.find_one_and_replace({'launch_id': m_launch.launch_id},
-                                                       m_launch.to_db_dict(), upsert=True)
 
-                if 'fwaction' in offline_data:
-                    fwaction = FWAction.from_dict(offline_data['fwaction'])
-                    state = offline_data['state']
-                    m_launch = Launch.from_dict(
-                        self.complete_launch(launch_id, fwaction, state))
-                    for s in m_launch.state_history:
-                        if s['state'] == offline_data['state']:
-                            s['created_on'] = reconstitute_dates(offline_data['completed_on'])
-                    self.launches.find_one_and_update({'launch_id': m_launch.launch_id},
-                                                      {'$set':
-                                                           {'state_history': m_launch.state_history}
-                                                      })
-                    self.offline_runs.update_one({"launch_id": launch_id},
-                                                 {"$set": {"completed": True}})
+            offline_data = loadfn(offline_loc)
+            if 'started_on' in offline_data:
+                m_launch.state = 'RUNNING'
+                for s in m_launch.state_history:
+                    if s['state'] == 'RUNNING':
+                        s['created_on'] = reconstitute_dates(offline_data['started_on'])
+                l = self.launches.find_one_and_replace({'launch_id': m_launch.launch_id},
+                                                       m_launch.to_db_dict(), upsert=True)
+                fw_id = l['fw_id']
+                f = self.fireworks.find_one_and_update({'fw_id': fw_id},
+                                                       {'$set':
+                                                            {'state': 'RUNNING',
+                                                             'updated_on': datetime.datetime.utcnow()
+                                                             }
+                                                        })
+                if f:
+                    self._refresh_wf(fw_id)
+
+            if 'checkpoint' in offline_data:
+                m_launch.touch_history(checkpoint=offline_data['checkpoint'])
+                self.launches.find_one_and_replace({'launch_id': m_launch.launch_id},
+                                                   m_launch.to_db_dict(), upsert=True)
+
+            if 'fwaction' in offline_data:
+                fwaction = FWAction.from_dict(offline_data['fwaction'])
+                state = offline_data['state']
+                m_launch = Launch.from_dict(
+                    self.complete_launch(launch_id, fwaction, state))
+                for s in m_launch.state_history:
+                    if s['state'] == offline_data['state']:
+                        s['created_on'] = reconstitute_dates(offline_data['completed_on'])
+                self.launches.find_one_and_update({'launch_id': m_launch.launch_id},
+                                                  {'$set':
+                                                       {'state_history': m_launch.state_history}
+                                                  })
+                self.offline_runs.update_one({"launch_id": launch_id},
+                                             {"$set": {"completed": True}})
 
             # update the updated_on
             self.offline_runs.update_one({"launch_id": launch_id},