minor fixes and prepare for release of v2.1.0

Signed-off-by: Romain Bezut <morian@xdec.net>

Author: morian

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Blacknet changelog
 
-## [2.1.0] - UNRELEASED
+## [2.1.0] - 2023-09-19
 - SQL: add a default value for notes on attackers
 - Drop compability with Python2, ensure compatibility up to Python3.11
 - Upgrade the build system to use `pyproject.toml` with setuptools
@@ -23,7 +23,7 @@
 - Fix log verbosity on failed connections
 - Add systemd example service scripts
 - Fix updater script for python3
-- Harden scrubber for `corrupted` databases
+- Harden scrubber for "corrupted" databases
 
 ## [2.0.6] - 2017-06-07
 - Work around hung threads

blacknet/sensor.py

@@ -14,7 +14,6 @@
 from .common import (
     BLACKNET_LOG_DEBUG,
     BLACKNET_LOG_DEFAULT,
-    BLACKNET_LOG_ERROR,
     BLACKNET_LOG_INFO,
     BLACKNET_PING_INTERVAL,
     BLACKNET_SSH_AUTH_RETRIES,
@@ -236,10 +235,6 @@ def log(self, message: str, level: int = BLACKNET_LOG_DEFAULT) -> None:
             peername = "%s" % (self.__peer_ip)
             self.__bns._logger.write(f"{peername}: {message}", level)
 
-    def log_error(self, message: str) -> None:
-        """Write an error message to the logger."""
-        self.log(message, BLACKNET_LOG_ERROR)
-
     def log_info(self, message: str) -> None:
         """Write an informational message to the logger."""
         self.log(message, BLACKNET_LOG_INFO)

blacknet/server.py

@@ -11,7 +11,6 @@
 
 from .common import (
     BLACKNET_LOG_CRITICAL,
-    BLACKNET_LOG_DEBUG,
     BLACKNET_LOG_DEFAULT,
     BLACKNET_LOG_ERROR,
     BLACKNET_LOG_INFO,
@@ -123,7 +122,7 @@ def log(self, message: str, level: int = BLACKNET_LOG_DEFAULT) -> None:
             self._logger.write(message, level)
 
     def log_critical(self, message: str) -> None:
-        """Write a critical message to the logger."""
+        """Write a critical error message to the logger."""
         self.log(message, BLACKNET_LOG_CRITICAL)
 
     def log_error(self, message: str) -> None:
@@ -134,10 +133,6 @@ def log_info(self, message: str) -> None:
         """Write an informational message to the logger."""
         self.log(message, BLACKNET_LOG_INFO)
 
-    def log_debug(self, message: str) -> None:
-        """Write a debug message to the logger."""
-        self.log(message, BLACKNET_LOG_DEBUG)
-
     def reload(self) -> None:
         """Reload instance configuration."""
         self.log_info("reloading configuration")

blacknet/updater.py

@@ -41,7 +41,7 @@ def __init__(self, cfg_file: Optional[str] = None):
 
     def __del__(self) -> None:
         """Remove temporary directories upon deletion."""
-        if not self.test_mode:
+        if not self.test_mode:  # pragma: no cover
             dirname = self.__dirname
         else:
             # That's the ZipDir (extracted)
@@ -57,7 +57,7 @@ def test_mode(self) -> bool:
         if self.__test_mode is None:
             if self.has_config("test_mode"):
                 self.__test_mode = bool(self.get_config("test_mode"))
-            else:
+            else:  # pragma: no cover
                 self.__test_mode = False
         return self.__test_mode
 
@@ -162,7 +162,7 @@ def update(self) -> None:
         self.csv_to_database()
 
         self.log("[+] Update Complete")
-        if not self.test_mode:
+        if not self.test_mode:  # pragma: no cover
             self.log(
                 '[!] We *STRONGLY* suggest running '
                 '"blacknet-scrubber --full-check --fix" to update gelocation positions.'

tests/requirements-linting.txt

@@ -1,6 +1,6 @@
 black==23.9.1
 isort==5.12.0
 mypy==1.5.1
-ruff==0.0.288
+ruff==0.0.290
 types-paramiko==3.3.0.0
 types-PyMySQL==1.1.0.1