Merge branch 'EnergyID-master'

Author: michiya

.gitignore

@@ -5,3 +5,6 @@
 *~
 .DS_Store
 Thumbs.db
+
+#pycharm
+.idea/*

azure_storage_logging/handlers.py

@@ -22,7 +22,8 @@
 from tempfile import mkstemp
 from zipfile import ZIP_DEFLATED, ZipFile
 
-from azure.storage.blob import BlobService
+from azure.storage.blob import BlockBlobService
+from azure.storage.blob.models import ContentSettings
 from azure.storage.queue import QueueService
 from azure.storage.table import TableService
 
@@ -48,7 +49,7 @@ def __init__(self,
                   max_connections=1,
                   max_retries=5,
                   retry_wait=1.0):
-        self.service = BlobService(account_name, account_key, protocol)
+        self.service = BlockBlobService(account_name, account_key, protocol)
         self.container_created = False
         hostname = gethostname()
         self.meta = {'hostname': hostname.replace('_', '-'),
@@ -79,13 +80,12 @@ def put_file_into_storage(self, dirName, fileName):
                 file_path = tmpfile_path
             else:
                 suffix, content_type = '', 'text/plain'
-            self.service.put_block_blob_from_path(self.container,
-                                                  fileName + suffix,
-                                                  file_path,
-                                                  x_ms_blob_content_type=content_type,
-                                                  max_connections=self.max_connections,
-                                                  max_retries=self.max_retries,
-                                                  retry_wait=self.retry_wait)
+            self.service.create_blob_from_path(container_name=self.container,
+                                               blob_name=fileName+suffix,
+                                               file_path=fileName,
+                                               content_settings=ContentSettings(content_type=content_type),
+                                               max_connections=self.max_connections
+                                               )  # max_retries and retry_wait no longer arguments in azure 0.33
         finally:
             if self.zip_compression and fd:
                 os.remove(tmpfile_path)

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name='azure-storage-logging',
-    version='0.5.0',
+    version='0.5.1',
     description='Logging handlers to send logs to Microsoft Azure Storage',
     long_description=open('README.rst').read(),
     author='Michiya Takahashi',
@@ -26,7 +26,7 @@
     license='Apache License 2.0',
     packages=['azure_storage_logging'],
     install_requires=[
-        'azure-storage',
+        'azure-storage>=0.33.0',
     ],
     classifiers=CLASSIFIERS,
     keywords='azure logging',