Skip to content

Commit 4726852

Browse files
authored
Merge pull request #238 from os2display/feature/screen-status-fixes
Screen Status: Added environment variables to infrastructure files
2 parents 43939e8 + a531b6c commit 4726852

File tree

5 files changed

+13
-4
lines changed

5 files changed

+13
-4
lines changed

.env

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
4141
###> App ###
4242
APP_DEFAULT_DATE_FORMAT='Y-m-d\TH:i:s.v\Z'
4343
APP_ACTIVATION_CODE_EXPIRE_INTERNAL=P2D
44-
APP_TRACK_SCREEN_INFO=false
45-
APP_TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS=300
4644
APP_KEY_VAULT_SOURCE=ENVIRONMENT
4745
APP_KEY_VAULT_JSON="{}"
4846
###< App ###
@@ -107,3 +105,6 @@ CALENDAR_API_FEED_SOURCE_CACHE_EXPIRE_SECONDS=300
107105
###< Calendar Api Feed Source ###
108106

109107
EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS=300
108+
109+
TRACK_SCREEN_INFO=false
110+
TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS=300

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
- [#238](https://github.com/os2display/display-api-service/pull/238)
8+
- Added screen status to infrastructure.
79
- [#232](https://github.com/os2display/display-api-service/pull/232)
810
- Updated user emails in readme.
911
- [#227](https://github.com/os2display/display-api-service/pull/227)

config/services.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ services:
1717
# @see https://api-platform.com/docs/core/state-processors/#hooking-into-the-built-in-state-processors
1818
$persistProcessor: '@api_platform.doctrine.orm.state.persist_processor'
1919
$removeProcessor: '@api_platform.doctrine.orm.state.remove_processor'
20-
$trackScreenInfo: '%env(bool:APP_TRACK_SCREEN_INFO)%'
21-
$trackScreenInfoUpdateIntervalSeconds: '%env(APP_TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS)%'
20+
$trackScreenInfo: '%env(bool:TRACK_SCREEN_INFO)%'
21+
$trackScreenInfoUpdateIntervalSeconds: '%env(TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS)%'
2222

2323
_instanceof:
2424
App\Feed\FeedTypeInterface:

infrastructure/itkdev/display-api-service/etc/confd/templates/env.local.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,6 @@ CALENDAR_API_FEED_SOURCE_CACHE_EXPIRE_SECONDS={{ getenv "APP_CALENDAR_API_FEED_S
6464
###< Calendar Api Feed Source ###
6565

6666
EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS={{ getenv "APP_EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS" "300" }}
67+
68+
TRACK_SCREEN_INFO={{ getenv "APP_TRACK_SCREEN_INFO" "false" }}
69+
TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS={{ getenv "APP_TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS" "300" }}

infrastructure/os2display/display-api-service/etc/confd/templates/env.local.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,6 @@ CALENDAR_API_FEED_SOURCE_CACHE_EXPIRE_SECONDS={{ getenv "CALENDAR_API_FEED_SOURC
6464
###< Calendar Api Feed Source ###
6565

6666
EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS={{ getenv "APP_EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS" "300" }}
67+
68+
TRACK_SCREEN_INFO={{ getenv "APP_TRACK_SCREEN_INFO" "false" }}
69+
TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS={{ getenv "APP_TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS" "300" }}

0 commit comments

Comments
 (0)