V1.4 release candidate 1

This commit is contained in:
Tom Keffer
2010-02-21 23:18:42 +00:00
parent e92acc6e84
commit 1d3cecafe0
5 changed files with 1421 additions and 1406 deletions

View File

@@ -4,8 +4,10 @@ CHANGE HISTORY
1.4.0 02/21/10
Changed the architecture of stats.py to one that uses very late binding. The
SQL statements are not run until template evaluation. This greatly reduces
the amount of memory required, as well as greatly simplifying the code.
SQL statements are not run until template evaluation. This reduces
the amount of memory required (by about 10MB), reduces memory fragmentation,
as well as greatly simplifying the code (file stats.py shed 100 lines of code).
Execution time is approximately the same.
Added option week_start. Default is 6 (Sunday).

View File

File diff suppressed because it is too large Load Diff

View File

@@ -312,7 +312,6 @@ def archiveWeekSpan(time_ts, startOfWeek = 6, grace = 30):
start at midnight of the day considered the start of the week, and be
one week long.
"""
print "start of week = ", startOfWeek
time_ts -= grace
_day_date = datetime.date.fromtimestamp(time_ts)
_day_of_week = _day_date.weekday()
@@ -493,16 +492,6 @@ def startOfArchiveDay(time_ts, grace = 30):
"""
return startOfDay(time_ts - grace)
# _time_dt = datetime.datetime.fromtimestamp(time_ts)
# if (_time_dt.hour, _time_dt.minute, _time_dt.second) == (0, 0, 0):
# _time_dt -= datetime.timedelta(days=1)
# _time_tt = _time_dt.timetuple()
# _bod_ts = time.mktime((_time_tt.tm_year,
# _time_tt.tm_mon,
# _time_tt.tm_mday,
# 0, 0, 0, 0, 0, -1))
# return int(_bod_ts)
def secs_to_string(secs):
"""

View File

@@ -726,6 +726,5 @@ socket_timeout = 20
[[ReportEngine]]
# The list of reports the report engine should run:
# report_list = weewx.reportengine.FileGen, weewx.reportengine.ImageGen, weewx.reportengine.Ftp
report_list = weewx.reportengine.FileGen,
report_list = weewx.reportengine.FileGen, weewx.reportengine.ImageGen, weewx.reportengine.Ftp

View File

@@ -52,8 +52,11 @@ class StdReportEngine(threading.Thread):
Runs through the list of report classes, instantiating each one,
then calling its "start()" method."""
syslog.syslog(syslog.LOG_DEBUG, "reportengine: Running reports for time %s" %
weeutil.weeutil.timestamp_to_string(self.gen_ts))
if self.gen_ts:
syslog.syslog(syslog.LOG_DEBUG, "reportengine: Running reports for time %s" %
weeutil.weeutil.timestamp_to_string(self.gen_ts))
else:
syslog.syslog(syslog.LOG_DEBUG, "reportengine: Running reports for latest time in the database.")
# Put the whole thing in a try block so we can log any exceptions that
# might bubble up