More error cleanup

Author: ericholscher

readthedocs/builds/syncers.py

@@ -140,7 +140,8 @@ def copy(cls, path, target, host, is_file=False, **__):
         )
         ret = os.system(sync_cmd)
         if ret != 0:
-            log.exception("COPY ERROR to app servers.", ret)
+            log.error("COPY ERROR to app servers. Return code: ", ret)
+            log.error("COPY ERROR command run:", sync_cmd)
 
 
 class Syncer(SettingsOverrideObject):

readthedocs/projects/tasks.py

@@ -347,28 +347,27 @@ def update_app_instances(self, html=False, localmedia=False, search=False,
                     'built': True,
                 })
         except HttpClientError:
-            log.error('Updating version failed, skipping file sync: version=%s',
-                      self.version.pk, exc_info=True)
-        else:
-            # Broadcast finalization steps to web application instances
-
-            broadcast(
-                type='app',
-                task=sync_files,
-                args=[
-                    self.project.pk,
-                    self.version.pk,
-                ],
-                kwargs=dict(
-                    hostname=socket.gethostname(),
-                    html=html,
-                    localmedia=localmedia,
-                    search=search,
-                    pdf=pdf,
-                    epub=epub,
-                ),
-                callback=sync_callback.s(version_pk=self.version.pk, commit=self.build['commit']),
-            )
+            log.exception('Updating version failed, skipping file sync: version=%s',
+                      self.version.pk)
+
+        # Broadcast finalization steps to web application instances
+        broadcast(
+            type='app',
+            task=sync_files,
+            args=[
+                self.project.pk,
+                self.version.pk,
+            ],
+            kwargs=dict(
+                hostname=socket.gethostname(),
+                html=html,
+                localmedia=localmedia,
+                search=search,
+                pdf=pdf,
+                epub=epub,
+            ),
+            callback=sync_callback.s(version_pk=self.version.pk, commit=self.build['commit']),
+        )
 
     def setup_environment(self):
         """
@@ -566,10 +565,10 @@ def update_imported_docs(version_pk):
 
         try:
             api_v2.project(project.pk).sync_versions.post(version_post_data)
-        except HttpClientError as e:
-            log.error("Sync Versions Exception: %s", e.content)
-        except Exception as e:
-            log.error("Unknown Sync Versions Exception", exc_info=True)
+        except HttpClientError:
+            log.exception("Sync Versions Exception")
+        except Exception:
+            log.exception("Unknown Sync Versions Exception")
     return ret_dict