From b0cb02f0bf6bc7d11a931a62b94891a64a8ccba8 Mon Sep 17 00:00:00 2001
From: David Trattnig <david.trattnig@o94.at>
Date: Wed, 27 Nov 2019 15:44:31 +0100
Subject: [PATCH] Fixed config path.
---
.gitlab-ci.yml | 2 +-
guru.py | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21cffe3a..f30d23ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ before_script:
- pip3 install -r requirements.txt
- mkdir /etc/aura
- mkdir /var/log/aura
- - cp ./configuration/sample.engine.ini ./configuration/engine.ini
+ - cp $CI_PROJECT_DIR/configuration/sample.engine.ini CI_PROJECT_DIR/configuration/engine.ini
simple_guru_help:
stage: test
diff --git a/guru.py b/guru.py
index 8872537d..67fe4bea 100755
--- a/guru.py
+++ b/guru.py
@@ -28,6 +28,7 @@ import time
import sys
import redis
+from pathlib import Path
from argparse import ArgumentParser
# own libs
@@ -37,7 +38,11 @@ from libraries.base.config import AuraConfig
class Guru():
- config = AuraConfig("/etc/aura/engine.ini")
+ """
+ Command Line Interface (CLI) for Aura Engine.
+ """
+ config_path = "%s/configuration/engine.ini" % Path(__file__).parent.absolute()
+ config = AuraConfig(config_path)
parser = None
args = None
@@ -63,7 +68,7 @@ class Guru():
else:
print("")
exit(4)
- except redis.exceptions.TimeoutError as te:
+ except redis.exceptions.TimeoutError:
print("Timeout when waiting for redis message. Is AURA daemon running? Exiting...")
exit(3)
@@ -146,6 +151,7 @@ def valid_playlist_entry(argument):
return index, fromtime, source
except:
msg = "Not a valid date: '{0}'.".format(argument[0])
+ print(msg)
raise
--
GitLab