Merge pull request #67 from NabuCasa/dev

0.14
NabuCasa · Jun 11, 2019 · b58090e · b58090e
2 parents efd9909 + 44f0bb6
commit b58090e
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 10 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -65,9 +65,18 @@ jobs:
     displayName: 'Use Python 3.7'
     inputs:
       versionSpec: '3.7'
-  - script: pip install twine
+  - script: |
+      setup_version="$(python setup.py -V)"
+      branch_version="$(Build.SourceBranchName)"
+
+      if [ "${setup_version}" != "${branch_version}" ]; then
+        echo "Version of tag ${branch_version} don't match with ${setup_version}!"
+        exit 1
+      fi
+    displayName: 'Check version of branch/tag'
+  - script: pip install twine wheel
     displayName: 'Install twine'
-  - script: python setup.py sdist
+  - script: python setup.py sdist bdist_wheel
     displayName: 'Build package'
   - script: |
       export TWINE_USERNAME="$(twineUser)"

diff --git a/hass_nabucasa/remote.py b/hass_nabucasa/remote.py
@@ -17,6 +17,9 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+RENEW_IF_EXPIRES_DAYS = 25
+WARN_RENEW_FAILED_DAYS = 18
+
 
 class RemoteError(Exception):
     """General remote error."""
@@ -307,26 +310,39 @@ async def _certificate_handler(self) -> None:
         """Handle certification ACME Tasks."""
         try:
             while True:
-                await asyncio.sleep(utils.next_midnight())
+                await asyncio.sleep(utils.next_midnight() + random.randint(1, 3600))
 
                 # Backend not initialize / No certificate issue now
                 if not self._snitun:
                     await self.load_backend()
                     continue
 
                 # Renew certificate?
-                if self._acme.expire_date > utils.utcnow() + timedelta(days=25):
+                if self._acme.expire_date > utils.utcnow() + timedelta(
+                    days=RENEW_IF_EXPIRES_DAYS
+                ):
                     continue
 
                 # Renew certificate
                 try:
                     await self._acme.issue_certificate()
                     await self.close_backend()
+
+                    # Wait until backend is cleaned
+                    await asyncio.sleep(5)
                     await self.load_backend()
                 except AcmeClientError:
-                    _LOGGER.warning(
-                        "Renew of ACME certificate fails. Try it lager again"
-                    )
+                    # Only log as warning if we have a certain amount of days left
+                    if (
+                        self._acme.expire_date
+                        > utils.utcnow()
+                        < timedelta(days=WARN_RENEW_FAILED_DAYS)
+                    ):
+                        meth = _LOGGER.warning
+                    else:
+                        meth = _LOGGER.debug
+
+                    meth("Renewal of ACME certificate failed. Please try again later.")
 
         except asyncio.CancelledError:
             pass

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup
 
-VERSION = "0.13"
+VERSION = "0.14"
 
 setup(
     name="hass-nabucasa",

diff --git a/tests/test_remote.py b/tests/test_remote.py
@@ -420,7 +420,9 @@ async def test_certificate_task_no_backend(
 
     acme_mock.expire_date = valid
 
-    with patch("hass_nabucasa.utils.next_midnight", return_value=0) as mock_midnight:
+    with patch(
+        "hass_nabucasa.utils.next_midnight", return_value=0
+    ) as mock_midnight, patch("random.randint", return_value=0):
         remote._acme_task = loop.create_task(remote._certificate_handler())
 
         await asyncio.sleep(0.1)
@@ -457,7 +459,9 @@ async def test_certificate_task_renew_cert(
 
     acme_mock.expire_date = utcnow() + timedelta(days=-40)
 
-    with patch("hass_nabucasa.utils.next_midnight", return_value=0) as mock_midnight:
+    with patch("hass_nabucasa.utils.next_midnight", return_value=0), patch(
+        "random.randint", return_value=0
+    ):
         remote._acme_task = loop.create_task(remote._certificate_handler())
 
         await remote.load_backend()