diff --git a/.gitlab-ci-compose.yml b/.gitlab-ci-compose.yml index c8a11afde1346c9e77b88d3f6aabd3a93fe88457..ee2deda0a64d2375c98ab31269820a0154050391 100644 --- a/.gitlab-ci-compose.yml +++ b/.gitlab-ci-compose.yml @@ -7,7 +7,7 @@ services: build: context: ./src dockerfile: ./ct_nginx/Dockerfile - image: gitlab-registry.poweron.dk/root/powerflux/powerflux_http:0.56.1 + image: gitlab-registry.poweron.dk/root/powerflux/powerflux_http:0.56.2 working_dir: /app volumes: - vol_powerflux_app:/app @@ -22,7 +22,7 @@ services: build: context: ./src dockerfile: ./ct_php-fpm/Dockerfile - image: gitlab-registry.poweron.dk/root/powerflux/powerflux_app:0.56.1 + image: gitlab-registry.poweron.dk/root/powerflux/powerflux_app:0.56.2 volumes: - vol_powerflux_app:/app - vol_powerflux_data:/private diff --git a/README.md b/README.md index 2b50caad829e57223f59a2b2a08d1899c1f31c78..44004962dae788628434d5bb5efe5c65261bf296 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Since this is a private instance of GitLab and signups are disabled, any questio Various info will be available, for use in Annotations in Grafana or for whatever you want, see *Example of JSON output* below. ->**Version: v0.56.1** +>**Version: v0.56.2** --- ### Manual installation or Docker? diff --git a/docker-compose_buildFromSource.yml b/docker-compose_buildFromSource.yml index 5d904cce2d893ece17d7202966351765509f0735..132b0468df6eb306d31ae3ab068595e2b196a45e 100644 --- a/docker-compose_buildFromSource.yml +++ b/docker-compose_buildFromSource.yml @@ -38,7 +38,8 @@ services: INFLUXDB_TOKEN: "thisWillbeUsedinSettings-PleaseCreateaNewTokenOnlyForThisBucket" INFLUXDB_BUCKET: "myBucket" INFLUXDB_ORG: "myOrganization" - LOGLEVEL: "INFO" + LOGLEVEL: ${LOGLEVEL:-INFO} + DEBUG: ${DEBUG:-false} #### InfluxDB (Optional) influxdb: diff --git a/docker-compose_prebuilt.yml b/docker-compose_prebuilt.yml index 3d86e29c5190b776346e116c6a59e26d86bff415..797781d20f284a222e95edf3f61372d614eeb702 100644 --- a/docker-compose_prebuilt.yml +++ b/docker-compose_prebuilt.yml @@ -2,7 +2,7 @@ services: #### nginx (Webserver - Optional) web-http: - image: gitlab-registry.poweron.dk/root/powerflux/powerflux_http:0.56.1 + image: gitlab-registry.poweron.dk/root/powerflux/powerflux_http:0.56.2 restart: always working_dir: /app volumes: @@ -14,7 +14,7 @@ services: #### PHP App (Required) php-fpm: - image: gitlab-registry.poweron.dk/root/powerflux/powerflux_app:0.56.1 + image: gitlab-registry.poweron.dk/root/powerflux/powerflux_app:0.56.2 restart: always volumes: - vol_powerflux_app:/app @@ -27,7 +27,8 @@ services: INFLUXDB_TOKEN: ${INFLUXDB_TOKEN} INFLUXDB_BUCKET: ${INFLUXDB_BUCKET} INFLUXDB_ORG: ${INFLUXDB_ORG} - LOGLEVEL: "INFO" + LOGLEVEL: ${LOGLEVEL:-INFO} + DEBUG: ${DEBUG:-false} volumes: vol_powerflux_app: diff --git a/src/php_app/public/get_ancient.php b/src/php_app/public/get_ancient.php index 7b9e49f0c2fd7490d2742c3b572eb70187f201b7..1d866039e1a6ca71f43d4573e780f1b055559a39 100644 --- a/src/php_app/public/get_ancient.php +++ b/src/php_app/public/get_ancient.php @@ -35,11 +35,12 @@ class UpdateAncientApp //App code - $env_debug = getenv('DEBUG'); + $env_debug = getenv("DEBUG"); if ($env_debug == "true" || $env_debug == "false") { - Configuration::setDebug($env_debug); + $_bool = filter_var($env_debug, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) ?? false; + Configuration::setDebug($_bool); } - $env_loglevel = getenv('LOGLEVEL'); + $env_loglevel = getenv("LOGLEVEL"); if (in_array($env_loglevel, $loglevels)) { ErrorOutput::setLogLevel($env_loglevel); } diff --git a/src/php_app/public/update.php b/src/php_app/public/update.php index f5c334599b4edfce02227b6ef45811b5f65ff567..94b12a68258830ff5e8cb3e0bbd6f472d2196d63 100644 --- a/src/php_app/public/update.php +++ b/src/php_app/public/update.php @@ -44,11 +44,12 @@ class UpdateApp //App code - $env_debug = getenv('DEBUG'); + $env_debug = getenv("DEBUG"); if ($env_debug == "true" || $env_debug == "false") { - Configuration::setDebug($env_debug); + $_bool = filter_var($env_debug, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) ?? false; + Configuration::setDebug($_bool); } - $env_loglevel = getenv('LOGLEVEL'); + $env_loglevel = getenv("LOGLEVEL"); if (in_array($env_loglevel, $loglevels)) { ErrorOutput::setLogLevel($env_loglevel); } @@ -77,7 +78,7 @@ class UpdateApp -//Readings,todo + //Readings,todo $meter = Configuration::getMeters(); if (($latestReading = Influxdb::getLatestReading($meter)?->format("Y-m-d")) !== false) { Configuration::setSettingsEntry("date_from", $latestReading); // Get date of latest reading in database