From 8eacde9ccc873e945c2e7748f42f6044b201c1b9 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Sun, 22 Dec 2019 13:36:13 +0100 Subject: [PATCH] Moved tautulli config settings to be fetched from our configuration (either env variable or conf/development.json. --- seasoned_api/conf/development.json.example | 5 +++++ seasoned_api/src/webserver/controllers/user/viewHistory.js | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/seasoned_api/conf/development.json.example b/seasoned_api/conf/development.json.example index 6f95f9a..cb421e7 100644 --- a/seasoned_api/conf/development.json.example +++ b/seasoned_api/conf/development.json.example @@ -11,6 +11,11 @@ "plex": { "ip": "" }, + "tautulli": { + "apiKey": "", + "ip": "", + "port": "" + }, "raven": { "DSN": "" }, diff --git a/seasoned_api/src/webserver/controllers/user/viewHistory.js b/seasoned_api/src/webserver/controllers/user/viewHistory.js index 52f08f8..1b7b4a4 100644 --- a/seasoned_api/src/webserver/controllers/user/viewHistory.js +++ b/seasoned_api/src/webserver/controllers/user/viewHistory.js @@ -1,6 +1,9 @@ const configuration = require('src/config/configuration').getInstance(); const Tautulli = require('src/tautulli/tautulli'); -const tautulli = new Tautulli('', '', ); +const apiKey = configuration.get('tautulli', 'apiKey'); +const ip = configuration.get('tautulli', 'ip'); +const port = configuration.get('tautulli', 'port'); +const tautulli = new Tautulli(apiKey, ip, port); function handleError(error, res) { const { status, message } = error;