diff --git a/csdr/module/toolbox.py b/csdr/module/toolbox.py index 998956be..a1322a03 100644 --- a/csdr/module/toolbox.py +++ b/csdr/module/toolbox.py @@ -84,7 +84,7 @@ class Dump1090Module(ExecModule): cmd = [ "dump1090", "--ifile", "-", "--iformat", "SC16", "--lat", str(lat), "--lon", str(lon), - "--metric" + "--modeac", "--metric", "--write-json", "/tmp" ] if rawOutput: cmd += [ "--raw" ] diff --git a/owrx/repeaters.py b/owrx/repeaters.py index 1ee84683..98843103 100644 --- a/owrx/repeaters.py +++ b/owrx/repeaters.py @@ -91,20 +91,22 @@ class Repeaters(object): file = self._getCachedDatabaseFile() ts = os.path.getmtime(file) if os.path.isfile(file) else 0 - with self.lock: - # If cached database is stale... - if time.time() - ts >= self.refreshPeriod: - # Load EIBI database file from the web - repeaters = self.loadFromWeb() - if repeaters: - # Save parsed data into a file - self.saveRepeaters(file, repeaters) - # Update current schedule + # If cached database is stale... + if time.time() - ts >= self.refreshPeriod: + # Load EIBI database file from the web + repeaters = self.loadFromWeb() + if repeaters: + # Save parsed data into a file + self.saveRepeaters(file, repeaters) + # Update current schedule + with self.lock: self.repeaters = repeaters - # If no current databse, load it from cached file - if not self.repeaters: - self.repeaters = self.loadRepeaters(file) + # If no current databse, load it from cached file + if not self.repeaters: + repeaters = self.loadRepeaters(file) + with self.lock: + self.repeaters = repeaters # # Save database to a given JSON file.