Improved error messages when the user tries to upload a file...

slapos/libnetworkcache/__init__.py

@@ -97,7 +97,9 @@ class NetworkcacheClient(object):
       shacache_connection.close()
 
     if result.status != 200:
-      raise UploadError('Failed to upload. Response code: %s. Response data: %s' % (result.status, data))
+      raise UploadError('Failed to upload the file to SHACACHE Server.' \
+                        'URL: %s. Response code: %s. Response data: %s' % \
+                                   (self.shacache_host, result.status, data))
 
     if directory_key is not None:
       path = os.path.join(self.shadir_path, directory_key)
@@ -124,6 +126,11 @@ class NetworkcacheClient(object):
       finally:
         shadir_connection.close()
 
+      if result.status != 200:
+        raise UploadError('Failed to upload data to SHADIR Server.' \
+                          'URL: %s. Response code: %s. Response data: %s' % \
+                                     (self.shacache_host, result.status, data))
+
     return json.loads(data)
 
   def download(self, sha512sum):