From b4fc20ce43335cd759cf175d40d5be5b7b43e7cd Mon Sep 17 00:00:00 2001
From: "E. Joshua Rigler" <erigler@usgs.gov>
Date: Fri, 5 Jan 2024 12:15:02 -0700
Subject: [PATCH] Remove cwbhost and cwbport from EdgeFactory
These options were never used. Presumably they were once intended to allow
a separate edgecwb host to be specified for non-real time data. It just isn't
obvious why this would be desirable in 2024.
---
geomagio/edge/EdgeFactory.py | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/geomagio/edge/EdgeFactory.py b/geomagio/edge/EdgeFactory.py
index 7b18ac56..8a6b5ff1 100644
--- a/geomagio/edge/EdgeFactory.py
+++ b/geomagio/edge/EdgeFactory.py
@@ -38,8 +38,6 @@ class EdgeFactory(TimeseriesFactory):
the port number the waveserver is listening on.
write_port: integer
the port number the client is writing to.
- cwbport: int
- the port number of the cwb host to connect to.
tag: str
A tag used by edge to log and associate a socket with a given data
source
@@ -62,8 +60,6 @@ class EdgeFactory(TimeseriesFactory):
locationCode: str
the location code for the given edge server, overrides type
in get_timeseries/put_timeseries
- cwbhost: str
- a string represeting the IP number of the cwb host to connect to.
See Also
--------
@@ -82,7 +78,6 @@ class EdgeFactory(TimeseriesFactory):
host: str = "edgecwb.usgs.gov",
port: int = 2060,
write_port: int = 7981,
- cwbport: int = 0,
tag: str = "GeomagAlg",
forceout: bool = False,
observatory: Optional[str] = None,
@@ -91,20 +86,17 @@ class EdgeFactory(TimeseriesFactory):
interval: Optional[DataInterval] = None,
observatoryMetadata: Optional[ObservatoryMetadata] = None,
locationCode: Optional[str] = None,
- cwbhost: Optional[str] = None,
):
TimeseriesFactory.__init__(self, observatory, channels, type, interval)
self.client = earthworm.Client(host, port)
self.host = host
self.port = port
self.write_port = write_port
- self.cwbport = cwbport
self.tag = tag
self.forceout = forceout
self.interval = interval
self.observatoryMetadata = observatoryMetadata or ObservatoryMetadata()
self.locationCode = locationCode
- self.cwbhost = cwbhost or ""
def get_timeseries(
self,
@@ -445,18 +437,10 @@ class EdgeFactory(TimeseriesFactory):
location=self.locationCode,
)
- now = UTCDateTime(datetime.utcnow())
- if ((now - endtime) > 864000) and (self.cwbport > 0):
- host = self.cwbhost
- port = self.cwbport
- else:
- host = self.host
- port = self.write_port
-
ric = RawInputClient(
self.tag,
- host,
- port,
+ self.host,
+ self.write_port,
sncl.station,
sncl.channel,
sncl.location,
--
GitLab