Merge pull request #28 from mchadwick-iqt/main

Switch Logging Level, Update Release Tag

Author: mchadwick-iqt

.github/workflows/release-tag.yaml

@@ -5,28 +5,31 @@ on:
     types: [ "published" ]
 
 jobs:
-  tag-remote:
+  push_to_registry:
+    name: Push Docker image to DockerHub
     runs-on: ubuntu-latest
     steps:
-    - name: Set up Docker buildx
-      id: buildx
-      uses: docker/setup-buildx-action@v3
-      with:
-        version: latest
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-    - name: Login to Docker Hub
-      run: echo "${{ secrets.DOCKER_TOKEN }}" | docker login --username "${{ vars.DOCKER_USERNAME }}" --password-stdin
+      - name: Set up Docker buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          version: latest
 
-    - name: Build image
-      env: 
-        GITHUB_REPOSITORY: ${{ github.repository }}
-        DOCKER_FOLDER: "object-ledger"
-        DOCKER_NAMESPACE: ${{ vars.DOCKER_NAMESPACE }}
-        RELEASE_NAME: ${{ github.event.release.name }}
-      run: |
-        GITHUB_REPO=$(basename $GITHUB_REPOSITORY)
-        docker buildx build $DOCKER_FOLDER \
-        --platform linux/arm64,linux/amd64 \
-        --push \
-        --tag $DOCKER_NAMESPACE/$GITHUB_REPO:latest \
-        --tag $DOCKER_NAMESPACE/$GITHUB_REPO:$RELEASE_NAME
+      - name: Log in to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ vars.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        env: 
+          DOCKER_FOLDER: "object-ledger"
+        with:
+          context: ${{ env.DOCKER_FOLDER }}
+          platforms: linux/arm64,linux/amd64
+          push: true
+          tags: ${{ vars.DOCKER_NAMESPACE }}/${{ github.event.repository.name }}:${{ github.event.release.name }}

object-ledger/object_ledger_pub_sub.py

@@ -201,25 +201,25 @@ def _state_callback(
         None
         """
         try:
-            logging.info("Entered ledger output callback")
+            logging.debug("Entered ledger output callback")
 
             # Populate required state based on message type
             data = self._decode_payload(msg)
             if "ADS-B" in data:
-                logging.info(f"Processing ADS-B state message data: {data}")
+                logging.debug(f"Processing ADS-B state message data: {data}")
                 state = json.loads(data["ADS-B"])
                 state["object_id"] = state["icao_hex"]
                 state["object_type"] = "aircraft"
 
             elif "Decoded AIS" in data:
-                logging.info(f"Processing AIS state message data: {data}")
+                logging.debug(f"Processing AIS state message data: {data}")
                 state = json.loads(data["Decoded AIS"])
                 state["object_id"] = state["mmsi"]
                 state["object_type"] = "ship"
                 state["track"] = state["course"]
 
             else:
-                logging.info(f"Skipping state message data: {data}")
+                logging.debug(f"Skipping state message data: {data}")
                 return
 
             # Pop keys that are not required columns
@@ -233,15 +233,15 @@ def _state_callback(
                 entry.set_index("object_id", inplace=True)
                 if entry.notna().all(axis=1).bool():
                     if not entry.index.isin(self.ledger.index):
-                        logging.info(f"Adding entry state data for object id: {entry.index}")
+                        logging.debug(f"Adding entry state data for object id: {entry.index}")
                         self.ledger = pd.concat([self.ledger, entry], ignore_index=False)
 
                     else:
-                        logging.info(f"Updating entry state data for object id: {entry.index}")
+                        logging.debug(f"Updating entry state data for object id: {entry.index}")
                         self.ledger.update(entry)
 
                 else:
-                    logging.info(f"Invalid entry: {entry}")
+                    logging.debug(f"Invalid entry: {entry}")
 
         except Exception as exception:
             # Set exception
@@ -266,7 +266,7 @@ def _publish_ledger(self) -> None:
             > self.ledger["object_type"].apply(self._get_max_entry_age)
         ].index
         if not index.empty:
-            logging.info(f"Dropping entry for object ids: {index}")
+            logging.debug(f"Dropping entry for object ids: {index}")
             self.ledger.drop(
                 index,
                 inplace=True,
@@ -311,11 +311,11 @@ def _send_data(self, data: Dict[str, str]) -> bool:
         )
         success = self.publish_to_topic(self.ledger_topic, out_json)
         if success:
-            logging.info(
+            logging.debug(
                 f"Successfully sent data on channel {self.ledger_topic}: {data}"
             )
         else:
-            logging.info(f"Failed to send data on channel {self.ledger_topic}: {data}")
+            logging.debug(f"Failed to send data on channel {self.ledger_topic}: {data}")
         return success
 
     def main(self) -> None: