Use logger instead of LOGGER.

Also, update changelog

CHANGELOG.md

@@ -18,7 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 ### Fixed
 - Fix resume scan. [#464](https://github.com/greenbone/ospd/pull/464)
-
+- Fix get_status. Backport #471.[#472](https://github.com/greenbone/ospd/pull/472)
 
 [Unreleased]: https://github.com/greenbone/ospd/compare/v21.4.3...HEAD
 

ospd/scan.py

@@ -356,16 +356,12 @@ def set_status(self, scan_id: str, status: ScanStatus) -> None:
             self.scans_table[scan_id]['end_time'] = int(time.time())
 
     def get_status(self, scan_id: str) -> ScanStatus:
-<<<<<<< HEAD
         """Get scan_id scans's status."""
-=======
-        """ Get scan_id scans's status."""
         status = None
         try:
             status = self.scans_table[scan_id].get('status')
         except KeyError:
-            LOGGER.error("Scan ID %s not found", scan_id)
->>>>>>> a682e99 (Fix: Fix get_status (#471))
+            logger.error("Scan ID %s not found", scan_id)
 
         return status
 
@@ -434,7 +430,7 @@ def simplify_exclude_host_count(self, scan_id: str) -> int:
             Count of excluded host.
         """
         exc_hosts_list = target_str_to_list(self.get_exclude_hosts(scan_id))
-        LOGGER.debug(
+        logger.debug(
             '%s: Excluded Hosts: %s',
             scan_id,
             pformat(exc_hosts_list),
@@ -443,7 +439,7 @@ def simplify_exclude_host_count(self, scan_id: str) -> int:
         finished_hosts_list = target_str_to_list(
             self.get_finished_hosts(scan_id)
         )
-        LOGGER.debug(
+        logger.debug(
             '%s: Finished Hosts: %s',
             scan_id,
             pformat(finished_hosts_list),