@@ -80,26 +80,21 @@ def DeleteUnwantedAlarmFields(alarm):
80
80
81
81
82
82
def ImportAlarms (alarms , id ):
83
- consoleLogger .debug ('Importing all alarms' )
84
- consoleLogger .debug (f'Alarms:{ alarms } ' )
83
+ consoleLogger .debug (f'Importing [{ len (alarms )} ] alarms for { id } ' )
85
84
timeShift = GetTimeDifference (alarms [0 ], 'creationTime' )
86
85
for alarm in alarms :
87
86
alarm ['source' ]['id' ] = id
88
87
alarm = DeleteUnwantedAlarmFields (alarm )
89
- alarm ['time' ] = (datetime .strptime (
90
- alarm ['time' ], timeFormat ) + timeShift ).strftime (timeFormat )
91
- consoleLogger .debug (f'Posting Alarm for device { id } : { alarm } ' )
88
+ alarm ['time' ] = (datetime .strptime (alarm ['time' ], timeFormat ) + timeShift ).strftime (timeFormat )
92
89
CreateAlarm (alarm )
93
90
consoleLogger .info ("Alarms import finished" )
94
91
95
92
96
93
def ImportMeasurements (measurements , id ):
97
- consoleLogger .debug ('Importing all measurements' )
98
- consoleLogger .debug (f'Measurements: { measurements } ' )
94
+ consoleLogger .debug (f'Importing [{ len (measurements )} ] alarms for { id } ' )
99
95
timeShift = GetTimeDifference (measurements [len (measurements ) - 1 ], 'time' )
100
96
for i in range (len (measurements )):
101
- measurements [i ]['time' ] = (datetime .strptime (
102
- measurements [i ]['time' ], timeFormat ) + timeShift ).strftime (timeFormat )
97
+ measurements [i ]['time' ] = (datetime .strptime (measurements [i ]['time' ], timeFormat ) + timeShift ).strftime (timeFormat )
103
98
measurements [i ]['source' ]['id' ] = id
104
99
measurements_object = {
105
100
"measurements" : measurements
0 commit comments