.gitlab-ci.yml

@@ -15,7 +15,7 @@ variables:
   CI_REGISTRY: ${CODE_REGISTRY}
   CI_REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE}
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-  TRIVY_VERSION: "0.11.0"
+  TRIVY_VERSION: "0.13.0"
   # docker variables
   DOCKER_DRIVER: overlay2
   FROM_IMAGE: ${CODE_REGISTRY}/devops/images/usgs/centos:7

geomagio/Controller.py

@@ -424,7 +424,7 @@ def get_output_factory(args):
     elif output_type == "miniseed":
         # TODO: deal with other miniseed arguments
         locationcode = args.outlocationcode or args.locationcode or None
-        output_factory = edge.EdgeFactory(
+        output_factory = edge.MiniSeedFactory(
             host=args.output_host,
             port=args.output_read_port,
             write_port=args.output_port,

geomagio/edge/MiniSeedInputClient.py

@@ -48,7 +48,7 @@ class MiniSeedInputClient(object):
             attempts += 1
             try:
                 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                s.connect(self.host, self.port)
+                s.connect((self.host, self.port))
                 break
             except socket.error as e:
                 if attempts >= max_attempts:
@@ -73,4 +73,4 @@ class MiniSeedInputClient(object):
         buf = io.BytesIO()
         stream.write(buf, format="MSEED")
         # send data
-        self.socket.sendall(buf)
+        self.socket.sendall(buf.read())