diff --git a/amplify/agent/common/context.py b/amplify/agent/common/context.py index 783d097..a51b6ec 100644 --- a/amplify/agent/common/context.py +++ b/amplify/agent/common/context.py @@ -37,8 +37,8 @@ class Context(Singleton): # define vars self.cpu_last_check = 0 - self.version_semver = (1, 8, 0) - self.version_build = 2 + self.version_semver = (1, 8, 1) + self.version_build = 1 self.uuid = None self.version = '%s-%s' % ('.'.join(map(str, self.version_semver)), self.version_build) self.environment = None diff --git a/amplify/agent/objects/nginx/config/parser.py b/amplify/agent/objects/nginx/config/parser.py index e74dbb6..71f15ae 100644 --- a/amplify/agent/objects/nginx/config/parser.py +++ b/amplify/agent/objects/nginx/config/parser.py @@ -66,7 +66,7 @@ def _iglob_pattern(pattern): def _getline(filename, lineno): - with open(filename, encoding='utf-8') as fp: + with open(filename, encoding='utf-8', errors='replace') as fp: for i, line in enumerate(fp, start=1): if i == lineno: return line.rstrip('\r\n') @@ -114,7 +114,7 @@ class NginxConfigParser(object): :param what: str - what action caused the error (used for logging) """ exc_cls = e.__class__.__name__ - exc_msg = e.strerror if hasattr(e, 'strerror') else e.message + exc_msg = e.strerror if hasattr(e, 'strerror') else str(e) message = 'failed to %s %s due to: %s' % (what, path, exc_cls) self.errors.append(message) if is_dir: @@ -145,7 +145,7 @@ class NginxConfigParser(object): self._add_directory(dirname, check=True) try: info = get_filesystem_info(filename) - info['lines'] = open(filename, encoding='utf-8').read().count('\n') + info['lines'] = open(filename, encoding='utf-8', errors='replace').read().count('\n') self.files[filename] = info except Exception as e: self._handle_error(filename, e, is_dir=False) @@ -337,7 +337,7 @@ class NginxConfigParser(object): yield filename try: # search each line for include or ssl_certificate directives - with open(filename, encoding='utf-8') as lines: + with open(filename, encoding='utf-8', errors='replace') as lines: for line in lines: if not has_directive(line): continue diff --git a/packages/nginx-amplify-agent/deb/debian/changelog b/packages/nginx-amplify-agent/deb/debian/changelog index ae49701..a5b440f 100644 --- a/packages/nginx-amplify-agent/deb/debian/changelog +++ b/packages/nginx-amplify-agent/deb/debian/changelog @@ -1,3 +1,10 @@ +nginx-amplify-agent (1.8.1-1) stable; urgency=low + + * crossplane updated to 0.5.8 + * fixed parsing of non-Unicode nginx configurations + + -- Andrei Belov Fri, 23 Sep 2022 15:22:10 +0400 + nginx-amplify-agent (1.8.0-2) stable; urgency=low * Bug fixes diff --git a/packages/nginx-amplify-agent/requirements-amzn2.txt b/packages/nginx-amplify-agent/requirements-amzn2.txt index 8120279..1c0fbfc 100644 --- a/packages/nginx-amplify-agent/requirements-amzn2.txt +++ b/packages/nginx-amplify-agent/requirements-amzn2.txt @@ -3,7 +3,7 @@ greenlet==0.4.14 netifaces==0.10.4 netaddr==0.8.0 flup==1.0.3 -crossplane==0.5.7 +crossplane==0.5.8 rstr==3.0.0 psutil==5.8.0 python-daemon==2.2.4 diff --git a/packages/nginx-amplify-agent/requirements-debian10.txt b/packages/nginx-amplify-agent/requirements-debian10.txt index 4502d44..7f82741 100644 --- a/packages/nginx-amplify-agent/requirements-debian10.txt +++ b/packages/nginx-amplify-agent/requirements-debian10.txt @@ -1,6 +1,6 @@ netaddr==0.8.0 flup==1.0.3 -crossplane==0.5.7 +crossplane==0.5.8 rstr==3.0.0 psutil==5.8.0 python-daemon==2.2.4 diff --git a/packages/nginx-amplify-agent/requirements-debian11.txt b/packages/nginx-amplify-agent/requirements-debian11.txt index 86d81ad..acdbb51 100644 --- a/packages/nginx-amplify-agent/requirements-debian11.txt +++ b/packages/nginx-amplify-agent/requirements-debian11.txt @@ -1,4 +1,4 @@ netaddr==0.8.0 flup==1.0.3 -crossplane==0.5.7 +crossplane==0.5.8 rstr==3.0.0 diff --git a/packages/nginx-amplify-agent/requirements-py310.txt b/packages/nginx-amplify-agent/requirements-py310.txt index 146b05f..c1b49a5 100644 --- a/packages/nginx-amplify-agent/requirements-py310.txt +++ b/packages/nginx-amplify-agent/requirements-py310.txt @@ -3,7 +3,7 @@ greenlet==1.1.1 netifaces==0.11.0 netaddr==0.8.0 flup==1.0.3 -crossplane==0.5.7 +crossplane==0.5.8 rstr==3.0.0 psutil==5.8.0 python-daemon==2.2.4 diff --git a/packages/nginx-amplify-agent/requirements-py39.txt b/packages/nginx-amplify-agent/requirements-py39.txt index 52ad896..5629262 100644 --- a/packages/nginx-amplify-agent/requirements-py39.txt +++ b/packages/nginx-amplify-agent/requirements-py39.txt @@ -3,7 +3,7 @@ greenlet==1.0.0 netifaces==0.11.0 netaddr==0.8.0 flup==1.0.3 -crossplane==0.5.7 +crossplane==0.5.8 rstr==3.0.0 psutil==5.8.0 python-daemon==2.2.4 diff --git a/packages/nginx-amplify-agent/requirements-rhel8.txt b/packages/nginx-amplify-agent/requirements-rhel8.txt index 3744fc5..77536d6 100644 --- a/packages/nginx-amplify-agent/requirements-rhel8.txt +++ b/packages/nginx-amplify-agent/requirements-rhel8.txt @@ -1,6 +1,6 @@ netaddr==0.8.0 flup==1.0.3 -crossplane==0.5.7 +crossplane==0.5.8 rstr==3.0.0 psutil==5.8.0 python-daemon==2.2.4 diff --git a/packages/nginx-amplify-agent/requirements-ubuntu1804.txt b/packages/nginx-amplify-agent/requirements-ubuntu1804.txt index 4502d44..7f82741 100644 --- a/packages/nginx-amplify-agent/requirements-ubuntu1804.txt +++ b/packages/nginx-amplify-agent/requirements-ubuntu1804.txt @@ -1,6 +1,6 @@ netaddr==0.8.0 flup==1.0.3 -crossplane==0.5.7 +crossplane==0.5.8 rstr==3.0.0 psutil==5.8.0 python-daemon==2.2.4 diff --git a/packages/nginx-amplify-agent/requirements-ubuntu2004.txt b/packages/nginx-amplify-agent/requirements-ubuntu2004.txt index 7fc14b3..d4b178d 100644 --- a/packages/nginx-amplify-agent/requirements-ubuntu2004.txt +++ b/packages/nginx-amplify-agent/requirements-ubuntu2004.txt @@ -1,5 +1,5 @@ netaddr==0.8.0 flup==1.0.3 -crossplane==0.5.7 +crossplane==0.5.8 rstr==3.0.0 psutil==5.8.0 diff --git a/packages/nginx-amplify-agent/requirements-ubuntu2204.txt b/packages/nginx-amplify-agent/requirements-ubuntu2204.txt index 86d81ad..acdbb51 100644 --- a/packages/nginx-amplify-agent/requirements-ubuntu2204.txt +++ b/packages/nginx-amplify-agent/requirements-ubuntu2204.txt @@ -1,4 +1,4 @@ netaddr==0.8.0 flup==1.0.3 -crossplane==0.5.7 +crossplane==0.5.8 rstr==3.0.0 diff --git a/packages/nginx-amplify-agent/requirements.txt b/packages/nginx-amplify-agent/requirements.txt index df95d22..d1a73e6 100644 --- a/packages/nginx-amplify-agent/requirements.txt +++ b/packages/nginx-amplify-agent/requirements.txt @@ -3,7 +3,7 @@ greenlet==0.4.14 netifaces==0.11.0 netaddr==0.8.0 flup==1.0.3 -crossplane==0.5.7 +crossplane==0.5.8 rstr==3.0.0 psutil==5.8.0 python-daemon==2.2.4 diff --git a/packages/nginx-amplify-agent/rpm/nginx-amplify-agent.spec b/packages/nginx-amplify-agent/rpm/nginx-amplify-agent.spec index 36cd05a..6ab6905 100644 --- a/packages/nginx-amplify-agent/rpm/nginx-amplify-agent.spec +++ b/packages/nginx-amplify-agent/rpm/nginx-amplify-agent.spec @@ -150,6 +150,11 @@ fi %changelog +* Fri Sep 23 2022 Andrei Belov 1.8.1-1 +- 1.8.1-1 +- crossplane updated to 0.5.8 +- fixed parsing of non-Unicode nginx configurations + * Tue Mar 29 2022 Bill Beckelhimer 1.8.0-2 - 1.8.0-2 - bug fixes diff --git a/packages/nginx-amplify-agent/setup-py310.py b/packages/nginx-amplify-agent/setup-py310.py index 5168fff..3ccaa35 100644 --- a/packages/nginx-amplify-agent/setup-py310.py +++ b/packages/nginx-amplify-agent/setup-py310.py @@ -33,7 +33,7 @@ elif is_deb(): setup( name="nginx-amplify-agent", - version="1.8.0", + version="1.8.1", author="Mike Belov", author_email="dedm@nginx.com", description="NGINX Amplify Agent", diff --git a/packages/nginx-amplify-agent/setup-py39.py b/packages/nginx-amplify-agent/setup-py39.py index 5168fff..3ccaa35 100644 --- a/packages/nginx-amplify-agent/setup-py39.py +++ b/packages/nginx-amplify-agent/setup-py39.py @@ -33,7 +33,7 @@ elif is_deb(): setup( name="nginx-amplify-agent", - version="1.8.0", + version="1.8.1", author="Mike Belov", author_email="dedm@nginx.com", description="NGINX Amplify Agent", diff --git a/packages/nginx-amplify-agent/setup.py b/packages/nginx-amplify-agent/setup.py index 8b29478..c6a7b25 100644 --- a/packages/nginx-amplify-agent/setup.py +++ b/packages/nginx-amplify-agent/setup.py @@ -33,7 +33,7 @@ elif is_deb(): setup( name="nginx-amplify-agent", - version="1.8.0", + version="1.8.1", author="Mike Belov", author_email="dedm@nginx.com", description="NGINX Amplify Agent", diff --git a/packages/version b/packages/version index 4057f1e..cf79782 100644 --- a/packages/version +++ b/packages/version @@ -1 +1 @@ -1.8.0-2 +1.8.1-1