fix bug

MyElectricalData · Nov 1, 2021 · fbde995 · fbde995
1 parent 691b88c
commit fbde995
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build_push_docker.yml b/.github/workflows/build_push_docker.yml
@@ -47,7 +47,7 @@ jobs:
             echo "::set-output name=dev::false"
           fi
 
-      - name: Discord notification
+      - name: Discord notification building state
 #        if: steps.check-tag.outputs.dev == 'false'
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
@@ -57,7 +57,7 @@ jobs:
 
       ##################################################################################################################
       # VERSION
-      - name: Build and push
+      - name: Build and push ${{ steps.vars.outputs.version }}
         uses: docker/build-push-action@v2
 #        if: steps.check-tag.outputs.dev == 'false'
         with:
@@ -67,7 +67,7 @@ jobs:
           tags: |
             m4dm4rtig4n/enedisgateway2mqtt:${{ steps.vars.outputs.version }}
 
-      - name: Discord notification
+      - name: Discord notification {{ steps.vars.outputs.version }} image version is up to date
 #        if: steps.check-tag.outputs.dev == 'false'
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
@@ -113,7 +113,7 @@ jobs:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
         uses: Ilshidur/action-discord@master
         with:
-          args: '**EnedisGateway2MQTT** : **Latest** image version is up to date'
+          args: '**EnedisGateway2MQTT** : **latest** image version is up to date'
 
       ##################################################################################################################
       # FINISH

diff --git a/app/main.py b/app/main.py
@@ -594,7 +594,7 @@ def run():
                 influx.influxdb_insert(cur, con, influxdb_api)
                 f.log(" => Data exported")
 
-            query = f"SELECT - FROM consumption_daily WHERE pdl == '{pdl}' AND fail > {fail_count} ORDER BY date"
+            query = f"SELECT * FROM consumption_daily WHERE pdl == '{pdl}' AND fail > {fail_count} ORDER BY date"
             rows = con.execute(query)
             if rows.fetchone() is not None:
                 f.logLine()
@@ -603,7 +603,7 @@ def run():
                 for row in rows:
                     f.log(f"{row[0]} => {row[1]}")
 
-            query = f"SELECT - FROM production_daily WHERE pdl == '{pdl}' AND fail > {fail_count} ORDER BY date"
+            query = f"SELECT * FROM production_daily WHERE pdl == '{pdl}' AND fail > {fail_count} ORDER BY date"
             rows = con.execute(query)
             if rows.fetchone() is not None:
                 f.logLine()