~tomasgroth/openlp/remote-sync

« back to all changes in this revision

Viewing changes to openlp/core/api/http/server.py

  • Committer: Tomas Groth
  • Date: 2019-02-14 20:36:25 UTC
  • mfrom: (2733.1.112 openlp)
  • Revision ID: tomasgroth@yahoo.dk-20190214203625-vwiq7mxob8p9qnt8
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
###############################################################################
5
5
# OpenLP - Open Source Lyrics Projection                                      #
6
6
# --------------------------------------------------------------------------- #
7
 
# Copyright (c) 2008-2018 OpenLP Developers                                   #
 
7
# Copyright (c) 2008-2019 OpenLP Developers                                   #
8
8
# --------------------------------------------------------------------------- #
9
9
# This program is free software; you can redistribute it and/or modify it     #
10
10
# under the terms of the GNU General Public License as published by the Free  #
30
30
from waitress.server import create_server
31
31
 
32
32
from openlp.core.api.deploy import download_and_check, download_sha256
33
 
from openlp.core.api.endpoint.controller import controller_endpoint, api_controller_endpoint
34
 
from openlp.core.api.endpoint.core import chords_endpoint, stage_endpoint, blank_endpoint, main_endpoint
 
33
from openlp.core.api.endpoint.controller import api_controller_endpoint, controller_endpoint
 
34
from openlp.core.api.endpoint.core import blank_endpoint, chords_endpoint, main_endpoint, stage_endpoint
35
35
from openlp.core.api.endpoint.remote import remote_endpoint
36
 
from openlp.core.api.endpoint.service import service_endpoint, api_service_endpoint
37
 
from openlp.core.api.http import application
38
 
from openlp.core.api.http import register_endpoint
 
36
from openlp.core.api.endpoint.service import api_service_endpoint, service_endpoint
 
37
from openlp.core.api.http import application, register_endpoint
39
38
from openlp.core.api.poll import Poller
40
39
from openlp.core.common.applocation import AppLocation
41
 
from openlp.core.common.i18n import UiStrings
42
 
from openlp.core.common.i18n import translate
 
40
from openlp.core.common.i18n import UiStrings, translate
43
41
from openlp.core.common.mixins import LogMixin, RegistryProperties
44
42
from openlp.core.common.path import create_paths
45
43
from openlp.core.common.registry import Registry, RegistryBase
46
44
from openlp.core.common.settings import Settings
47
45
from openlp.core.threading import ThreadWorker, run_thread
48
46
 
 
47
 
49
48
log = logging.getLogger(__name__)
50
49
 
51
50