mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-06-09 09:35:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

The archive sqlite file used by the RESTful protocols is now opened within the RESTful thread itself.

Browse Source
This commit is contained in:
Tom Keffer
2012-08-25 01:38:50 +00:00
parent 8fe564cd8c
commit 00fdf12eff
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/weewx/restful.py
View File

@@ -17,6 +17,7 @@ import urllib2
import socket
import time
import weewx.archive
import weewx.units
import weeutil.weeutil
@@ -448,10 +449,10 @@ class RESTThread(threading.Thread):
Basically, it watches a queue, and if anything appears in it, it publishes it.
The queue should be populated with the timestamps of the data records to be published.
"""
def __init__(self, archive, queue, station_list):
def __init__(self, archiveFilename, queue, station_list):
"""Initialize an instance of RESTThread.
archive: The archive database. Usually an instance of weewx.archive.Archive
archiveFilename: The file name for hte archive database.
queue: An instance of Queue.Queue where the timestamps will appear
@@ -461,7 +462,7 @@ class RESTThread(threading.Thread):
# In the strange vocabulary of Python, declaring yourself a "daemon thread"
# allows the program to exit even if this thread is running:
self.setDaemon(True)
self.archive = archive
self.archive = weewx.archive.Archive(archiveFilename)
self.queue = queue # Fifo queue where new records will appear
self.station_list = station_list
@@ -472,6 +473,7 @@ class RESTThread(threading.Thread):
# A 'None' value appearing in the queue is our signal to exit
if time_ts is None:
self.archive.close()
return
# This string is just used for logging:
@@ -505,6 +507,7 @@ class RESTThread(threading.Thread):
syslog.syslog(syslog.LOG_CRIT, " **** %s" % (e,))
weeutil.weeutil.log_traceback(" **** ")
syslog.syslog(syslog.LOG_CRIT, " **** Thread terminating.")
self.archive.close()
raise
else:
syslog.syslog(syslog.LOG_INFO, "restful: Published record %s to %s station %s" % (time_str, station.site, station.station))

3
bin/weewx/wxengine.py
View File

@@ -717,11 +717,10 @@ class StdRESTful(StdService):
# Create an instance of weewx.archive.Archive
archiveFilename = os.path.join(config_dict['Station']['WEEWX_ROOT'],
config_dict['StdArchive']['archive_file'])
archive = weewx.archive.Archive(archiveFilename)
# Create the queue into which we'll put the timestamps of new data
self.queue = Queue.Queue()
# Start up the thread:
self.thread = weewx.restful.RESTThread(archive, self.queue, station_list)
self.thread = weewx.restful.RESTThread(archiveFilename, self.queue, station_list)
self.thread.start()
syslog.syslog(syslog.LOG_DEBUG, "wxengine: Started thread for RESTful upload sites.")