Skip to content
Snippets Groups Projects
Commit 34a76cbc authored by David Trattnig's avatar David Trattnig
Browse files

Wireup active source, fixes.

parent ab3e6ead
No related branches found
No related tags found
No related merge requests found
import connexion import connexion
import six import six
from flask import current_app
from src.rest.models.clock_info import ClockInfo # noqa: E501 from src.rest.models.clock_info import ClockInfo # noqa: E501
from src.rest.models.health_log import HealthLog # noqa: E501 from src.rest.models.health_log import HealthLog # noqa: E501
from src.rest.models.inline_response400 import InlineResponse400 # noqa: E501 from src.rest.models.inline_response400 import InlineResponse400 # noqa: E501
...@@ -21,7 +23,7 @@ def add_playlog(body): # noqa: E501 ...@@ -21,7 +23,7 @@ def add_playlog(body): # noqa: E501
if connexion.request.is_json: if connexion.request.is_json:
body = PlayLog.from_dict(connexion.request.get_json()) # noqa: E501 body = PlayLog.from_dict(connexion.request.get_json()) # noqa: E501
service = current_app.config['SERVICE'] service = current_app.config['SERVICE']
service.store_playlog(body) return service.store_playlog(body)
def clock_info(): # noqa: E501 def clock_info(): # noqa: E501
...@@ -43,7 +45,8 @@ def get_active_source(): # noqa: E501 ...@@ -43,7 +45,8 @@ def get_active_source(): # noqa: E501
:rtype: int :rtype: int
""" """
return 'do some magic!' service = current_app.config['SERVICE']
return service.get_active_source()
def get_report(year_month): # noqa: E501 def get_report(year_month): # noqa: E501
...@@ -116,4 +119,5 @@ def set_active_source(number): # noqa: E501 ...@@ -116,4 +119,5 @@ def set_active_source(number): # noqa: E501
:rtype: None :rtype: None
""" """
return 'do some magic!' service = current_app.config['SERVICE']
return service.set_active_source(number)
import connexion import connexion
import six import six
from flask import current_app
from src.rest.models.play_log import PlayLog # noqa: E501 from src.rest.models.play_log import PlayLog # noqa: E501
from src.rest import util from src.rest import util
from flask import current_app
def current_track(): # noqa: E501 def current_track(): # noqa: E501
"""Get current track """Get current track
......
...@@ -21,7 +21,7 @@ import datetime ...@@ -21,7 +21,7 @@ import datetime
import requests import requests
from enum import Enum from enum import Enum
from models import PlayLog, PlayLogSchema, TrackSchema from models import PlayLog, PlayLogSchema, TrackSchema, ActivityLog
class NodeType(Enum): class NodeType(Enum):
...@@ -78,14 +78,14 @@ class ApiService(): ...@@ -78,14 +78,14 @@ class ApiService():
msg = "Pushing data to '%s'" % (self.sync_host) msg = "Pushing data to '%s'" % (self.sync_host)
# Set active source # Set active source
self.active_source = ActivityLog.get_active_source() self.active_source = ActivityLog.get_active_source().source_number
if not self.active_source: if not self.active_source:
if self.node_type == NodeType.MAIN: if self.node_type == NodeType.MAIN:
source_number = self.config.get("host_id") source_number = self.config.get("host_id")
else: else:
source_number = self.config.get("default_source") source_number = self.config.get("default_source")
self.set_active_source(source_number) self.set_active_source(source_number)
self.logger("Active source: %s" % self.active_source) self.logger.info("Active source: %s" % self.active_source)
self.logger.info("Running in '%s' mode. %s." % (self.node_type, msg)) self.logger.info("Running in '%s' mode. %s." % (self.node_type, msg))
...@@ -190,10 +190,10 @@ class ApiService(): ...@@ -190,10 +190,10 @@ class ApiService():
Args: Args:
source_number (Integer): Number of the engine source_number (Integer): Number of the engine
""" """
if self.active_source > 0: if source_number > 0:
if self.active_source != source_number: if self.active_source != source_number:
self.active_source = source_number self.active_source = source_number
activity_log = ActivityLog(active_source) activity_log = ActivityLog(source_number)
activity_log.save() activity_log.save()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment