added historical database close and disconnect at the end of reports

myems-api/reports/combinedequipmentcost.py

@@ -452,6 +452,11 @@ class Reporting:
         if cnx_billing:
             cnx_billing.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['combined_equipment'] = dict()

myems-api/reports/combinedequipmentefficiency.py

@@ -560,6 +560,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['combined_equipment'] = dict()

myems-api/reports/combinedequipmentenergycategory.py

@@ -466,6 +466,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['combined_equipment'] = dict()

myems-api/reports/combinedequipmentenergyitem.py

@@ -456,6 +456,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['combined_equipment'] = dict()

myems-api/reports/combinedequipmentincome.py

@@ -432,6 +432,11 @@ class Reporting:
         if cnx_billing:
             cnx_billing.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['combined_equipment'] = dict()

myems-api/reports/combinedequipmentload.py

@@ -452,6 +452,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['combined_equipment'] = dict()

myems-api/reports/combinedequipmentoutput.py

@@ -432,6 +432,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['combined_equipment'] = dict()

myems-api/reports/combinedequipmentsaving.py

@@ -586,6 +586,11 @@ class Reporting:
         if cnx_energy_baseline:
             cnx_energy_baseline.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['combined_equipment'] = dict()

myems-api/reports/combinedequipmentstatistics.py

@@ -458,6 +458,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['combined_equipment'] = dict()

myems-api/reports/equipmentcost.py

@@ -441,6 +441,11 @@ class Reporting:
         if cnx_billing:
             cnx_billing.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['equipment'] = dict()

myems-api/reports/equipmentenergycategory.py

@@ -456,6 +456,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['equipment'] = dict()

myems-api/reports/equipmentenergyitem.py

@@ -448,6 +448,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['equipment'] = dict()

myems-api/reports/equipmentincome.py

@@ -423,6 +423,11 @@ class Reporting:
         if cnx_billing:
             cnx_billing.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['equipment'] = dict()

myems-api/reports/equipmentload.py

@@ -445,6 +445,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['equipment'] = dict()

myems-api/reports/equipmentoutput.py

@@ -423,6 +423,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['equipment'] = dict()

myems-api/reports/equipmentsaving.py

@@ -575,6 +575,11 @@ class Reporting:
         if cnx_energy_baseline:
             cnx_energy_baseline.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['equipment'] = dict()

myems-api/reports/equipmentstatistics.py

@@ -451,6 +451,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['equipment'] = dict()

myems-api/reports/shopfloorcost.py

@@ -457,6 +457,11 @@ class Reporting:
         if cnx_billing:
             cnx_billing.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['shopfloor'] = dict()

myems-api/reports/shopfloorenergycategory.py

@@ -471,6 +471,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['shopfloor'] = dict()

myems-api/reports/shopfloorenergyitem.py

@@ -463,6 +463,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['shopfloor'] = dict()

myems-api/reports/shopfloorload.py

@@ -460,6 +460,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['shopfloor'] = dict()

myems-api/reports/shopfloorsaving.py

@@ -590,6 +590,11 @@ class Reporting:
         if cnx_energy_baseline:
             cnx_energy_baseline.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['shopfloor'] = dict()

myems-api/reports/shopfloorstatistics.py

@@ -466,6 +466,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['shopfloor'] = dict()

myems-api/reports/spacecost.py

@@ -499,6 +499,11 @@ class Reporting:
         if cnx_billing:
             cnx_billing.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['space'] = dict()

myems-api/reports/spaceefficiency.py

@@ -554,6 +554,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['space'] = dict()

myems-api/reports/spaceenergycategory.py

@@ -519,6 +519,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['space'] = dict()

myems-api/reports/spaceenergyitem.py

@@ -506,6 +506,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['space'] = dict()

myems-api/reports/spaceincome.py

@@ -480,6 +480,11 @@ class Reporting:
         if cnx_billing:
             cnx_billing.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['space'] = dict()

myems-api/reports/spaceload.py

@@ -460,6 +460,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['space'] = dict()

myems-api/reports/spaceoutput.py

@@ -480,6 +480,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['space'] = dict()

myems-api/reports/spacesaving.py

@@ -661,6 +661,11 @@ class Reporting:
         if cnx_energy_baseline:
             cnx_energy_baseline.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['space'] = dict()

myems-api/reports/spacestatistics.py

@@ -464,6 +464,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['space'] = dict()

myems-api/reports/storecost.py

@@ -455,6 +455,11 @@ class Reporting:
         if cnx_billing:
             cnx_billing.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['store'] = dict()

myems-api/reports/storeenergycategory.py

@@ -469,6 +469,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['store'] = dict()

myems-api/reports/storeenergyitem.py

@@ -461,6 +461,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['store'] = dict()

myems-api/reports/storeload.py

@@ -460,6 +460,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['store'] = dict()

myems-api/reports/storesaving.py

@@ -586,6 +586,11 @@ class Reporting:
         if cnx_energy_baseline:
             cnx_energy_baseline.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['store'] = dict()

myems-api/reports/storestatistics.py

@@ -465,6 +465,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['store'] = dict()

myems-api/reports/tenantcost.py

@@ -455,6 +455,11 @@ class Reporting:
         if cnx_billing:
             cnx_billing.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['tenant'] = dict()

myems-api/reports/tenantenergycategory.py

@@ -469,6 +469,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['tenant'] = dict()

myems-api/reports/tenantenergyitem.py

@@ -461,6 +461,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['tenant'] = dict()

myems-api/reports/tenantload.py

@@ -460,6 +460,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['tenant'] = dict()

myems-api/reports/tenantsaving.py

@@ -586,6 +586,11 @@ class Reporting:
         if cnx_energy_baseline:
             cnx_energy_baseline.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['tenant'] = dict()

myems-api/reports/tenantstatistics.py

@@ -464,6 +464,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = dict()
 
         result['tenant'] = dict()

myems-api/reports/virtualmetercost.py

@@ -341,6 +341,11 @@ class Reporting:
         if cnx_billing:
             cnx_billing.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = {
             "virtual_meter": {
                 "cost_center_id": virtual_meter['cost_center_id'],

myems-api/reports/virtualmeterenergy.py

@@ -281,6 +281,11 @@ class Reporting:
         if cnx_energy:
             cnx_energy.disconnect()
 
+        if cnx_historical:
+            cnx_historical.close()
+        if cursor_historical:
+            cursor_historical.disconnect()
+
         result = {
             "virtual_meter": {
                 "cost_center_id": virtual_meter['cost_center_id'],