Merge pull request #147 from cdolghier/fix_history_fetching_offset

Fix --resetdatabase
jertel · Jan 8, 2024 · 99857ab · 99857ab
2 parents 601ea9d + 0f0c8fe
commit 99857ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,7 @@
 - Added `timezone` config to allow configuring the timezone according to which end-of-day is calculated.
 
 ## Other changes
-- TBD
+- Fixed `--resetdatabase` (broken in 1.6.1)
 
 # 1.6.1
 

diff --git a/src/vuegraf/vuegraf.py b/src/vuegraf/vuegraf.py
@@ -269,7 +269,7 @@ def extractDataPoints(device, usageDataPoints, pointType=None, historyStartTime=
             info('Resetting database')
             delete_api = influx2.delete_api()
             start = '1970-01-01T00:00:00Z'
-            stop = startupTime.isoformat(timespec='seconds') + 'Z'
+            stop = startupTime.isoformat(timespec='seconds').replace("+00:00", "") + 'Z'
             delete_api.delete(start, stop, '_measurement="energy_usage"', bucket=bucket, org=org)
     else:
         info('Using InfluxDB version 1')
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ @@
     - Added `timezone` config to allow configuring the timezone according to which end-of-day is calculated.
     ## Other changes
-    - TBD
+    - Fixed `--resetdatabase` (broken in 1.6.1)
     # 1.6.1
@@ Expand Down @@