Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add log level as envvar and testing #178

Merged
merged 1 commit into from
May 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions iotedgedev/envvars.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ def load(self, force=False):
self.CONTAINER_TAG = self.get_envvar("CONTAINER_TAG")
self.RUNTIME_TAG = self.get_envvar("RUNTIME_TAG")
self.RUNTIME_VERBOSITY = self.get_envvar("RUNTIME_VERBOSITY")
self.RUNTIME_LOG_LEVEL = self.get_envvar("RUNTIME_LOG_LEVEL", default="info")
self.CONFIG_OUTPUT_DIR = self.get_envvar("CONFIG_OUTPUT_DIR", default="config")
self.DEPLOYMENT_CONFIG_FILE = self.get_envvar("DEPLOYMENT_CONFIG_FILE", altkeys=['MODULES_CONFIG_FILE'])
self.DEPLOYMENT_CONFIG_FILE_PATH = os.path.join(self.CONFIG_OUTPUT_DIR, self.DEPLOYMENT_CONFIG_FILE)
Expand Down
3 changes: 3 additions & 0 deletions iotedgedev/template/.env.tmp
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ RUNTIME_TAG="1.0-preview"
RUNTIME_VERBOSITY="INFO"
# "DEBUG", "INFO", "ERROR", "WARNING"

RUNTIME_LOG_LEVEL="info"
# "debug", "info"

#
# MODULES
#
Expand Down
2 changes: 1 addition & 1 deletion iotedgedev/template/runtime.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"homeDir": "${RUNTIME_HOME_DIR}",
"configDir": "${RUNTIME_CONFIG_DIR}",
"hostName": "${RUNTIME_HOST_NAME}",
"logLevel": "info",
"logLevel": "${RUNTIME_LOG_LEVEL}",
"schemaVersion": "1",
"security": {
"certificates": {
Expand Down
49 changes: 49 additions & 0 deletions tests/test_envvars.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import pytest

from iotedgedev.envvars import EnvVars
from iotedgedev.output import Output

def test_valid_get_envvar():
output = Output()
envvars = EnvVars(output)
loglevel = envvars.get_envvar("RUNTIME_LOG_LEVEL")
assert loglevel == "info" or "debug"

def test_invalid_get_envvar():
output = Output()
envvars = EnvVars(output)
testerval = envvars.get_envvar("TESTER")
assert not testerval

def test_valid_load():
output = Output()
envvars = EnvVars(output)
envvars.load()
assert envvars.RUNTIME_LOG_LEVEL == "info" or "debug"

def test_valid_verify_envvar_has_val():
output = Output()
envvars = EnvVars(output)
envvars.load()
result = envvars.verify_envvar_has_val("RUNTIME_LOG_LEVEL", envvars.RUNTIME_LOG_LEVEL)
assert not result

def test_valid_get_envvar_key_if_val():
output = Output()
envvars = EnvVars(output)
assert envvars.get_envvar_key_if_val("RUNTIME_LOG_LEVEL")

def test_invalid_get_envvar_key_if_val():
output = Output()
envvars = EnvVars(output)
assert not envvars.get_envvar_key_if_val("TESTER")

def test_set_envvar():
output = Output()
envvars = EnvVars(output)
loglevel = envvars.get_envvar("RUNTIME_LOG_LEVEL")
envvars.set_envvar("RUNTIME_LOG_LEVEL", "debug")
setlevel = envvars.get_envvar("RUNTIME_LOG_LEVEL")
assert setlevel == "debug"
envvars.set_envvar("RUNTIME_LOG_LEVEL", loglevel)