Merge pull request #2838 from CartoDB/1357-clear-sync-errors-after-su…

…ccess 1357 clear sync errors after success
CartoDB · Mar 20, 2015 · 8bf0ddf · 8bf0ddf
2 parents 16d100d + 2703bd2
commit 8bf0ddf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/models/synchronization/member.rb b/app/models/synchronization/member.rb
@@ -133,6 +133,7 @@ def should_auto_sync?
       def run
         importer = nil
         self.state    = STATE_SYNCING
+        self.store
 
         # First import is a "normal import" so still has no id, then run gets called and will get log first time
         # but we need this to fix old logs

diff --git a/services/datasources/lib/datasources/url/gdrive.rb b/services/datasources/lib/datasources/url/gdrive.rb
@@ -190,7 +190,7 @@ def get_resource(id)
           result = @client.execute(uri: item_data.fetch(:url))
 
           if result.status != 200
-            if result.data['error'].nil? || result.data['error']['message'].nil?
+            if result.data.nil? || result.data['error'].nil? || result.data['error']['message'].nil?
               error_message = 'Unknown error'
             else
               error_message = result.data['error']['message']