external/fastocloud_admin
1
0
Fork 0
mirror of https://github.com/fastogt/fastocloud_admin.git synced 2025-03-09 23:38:52 +00:00
Code Issues Releases Wiki Activity

Remove sub

Browse source
This commit is contained in:
topilski 2019-09-03 09:10:08 -04:00
parent cde3017f57
commit 99184859a4
5 changed files with 4 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/common

@ -1 +1 @@
Subproject commit bb2c317fd80cec24861458a120db09dccfe712dd Subproject commit 99e119d1facbd614f7f8307f9512578e79eead8a

3
app/config/config.py
View file

@ -2,5 +2,4 @@ SECRET_KEY = '1d4bb560a7644fa48852a92ce52d6e08'
SERVER_NAME_FOR_POST = '0.0.0.0:8080' SERVER_NAME_FOR_POST = '0.0.0.0:8080'
PREFERRED_URL_SCHEME = 'http' PREFERRED_URL_SCHEME = 'http'
BOOTSTRAP_SERVE_LOCAL = True BOOTSTRAP_SERVE_LOCAL = True
SUBSCRIBERS_SUPPORT = True

18
app/service/service_client.py
View file

@ -25,8 +25,6 @@ class ServiceClient(IClientHandler):
HTTP_HOST = 'http_host' HTTP_HOST = 'http_host'
VODS_HOST = 'vods_host' VODS_HOST = 'vods_host'
CODS_HOST = 'cods_host' CODS_HOST = 'cods_host'
SUBSCRIBERS_HOST = 'subscribers_host'
BANDWIDTH_HOST = 'bandwidth_host'
VERSION = 'version' VERSION = 'version'
OS = 'os' OS = 'os'
@ -138,12 +136,6 @@ class ServiceClient(IClientHandler):
def get_cods_host(self) -> str: def get_cods_host(self) -> str:
return self._cods_host return self._cods_host
def get_subscribers_host(self) -> str:
return self._subscribers_host
def get_bandwidth_host(self) -> str:
return self._bandwidth_host
def get_vods_in(self) -> list: def get_vods_in(self) -> list:
return self._vods_in return self._vods_in
@ -158,14 +150,11 @@ class ServiceClient(IClientHandler):
if req.method == Commands.ACTIVATE_COMMAND and resp.is_message(): if req.method == Commands.ACTIVATE_COMMAND and resp.is_message():
if self._handler: if self._handler:
result = resp.result result = resp.result
subscribers_host = result.get(ServiceClient.SUBSCRIBERS_HOST, None)
bandwidth_host = result.get(ServiceClient.BANDWIDTH_HOST, None)
os = OperationSystem(**result[ServiceClient.OS]) os = OperationSystem(**result[ServiceClient.OS])
self._set_runtime_fields(result[ServiceClient.HTTP_HOST], result[ServiceClient.VODS_HOST], self._set_runtime_fields(result[ServiceClient.HTTP_HOST], result[ServiceClient.VODS_HOST],
result[ServiceClient.CODS_HOST], subscribers_host, bandwidth_host, result[ServiceClient.CODS_HOST], result[ServiceClient.VERSION], os)
result[ServiceClient.VERSION], os)
self._handler.on_service_statistic_received(result) self._handler.on_service_statistic_received(result)
if req.method == Commands.PREPARE_SERVICE_COMMAND and resp.is_message(): if req.method == Commands.PREPARE_SERVICE_COMMAND and resp.is_message():
@ -199,16 +188,13 @@ class ServiceClient(IClientHandler):
self._handler.on_client_state_changed(status) self._handler.on_client_state_changed(status)
# private # private
def _set_runtime_fields(self, http_host=None, vods_host=None, cods_host=None, subscribers_host=None, def _set_runtime_fields(self, http_host=None, vods_host=None, cods_host=None,
bandwidth_host=None,
version=None, version=None,
os=None, os=None,
vods_in=None): vods_in=None):
self._http_host = http_host self._http_host = http_host
self._vods_host = vods_host self._vods_host = vods_host
self._cods_host = cods_host self._cods_host = cods_host
self._subscribers_host = subscribers_host
self._bandwidth_host = bandwidth_host
self._version = version self._version = version
self._os = os self._os = os
self._vods_in = vods_in self._vods_in = vods_in

2
app/templates/provider/dashboard.html
View file

@ -167,14 +167,12 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
{% trans %}Providers{% endtrans %} {% trans %}Providers{% endtrans %}
</a> </a>
</div> </div>
{% if (config['SUBSCRIBERS_SUPPORT']) %}
<div class="col-md-1"> <div class="col-md-1">
<a href="{{ url_for('ServiceView:subscribers', sid=service.id) }}" class="btn btn-success" <a href="{{ url_for('ServiceView:subscribers', sid=service.id) }}" class="btn btn-success"
role="button"> role="button">
{% trans %}Subscribers{% endtrans %} {% trans %}Subscribers{% endtrans %}
</a> </a>
</div> </div>
{% endif %}
{% if (role == 2) %} {% if (role == 2) %}
<div class="col-md-1"> <div class="col-md-1">
<a href="{{ url_for('ServiceView:get_log') }}" role="button" <a href="{{ url_for('ServiceView:get_log') }}" role="button"

4
app/templates/service/base.html
View file

@ -40,10 +40,6 @@
<br> <br>
{{ render_bootstrap_form(form.cods_host) }} {{ render_bootstrap_form(form.cods_host) }}
<br> <br>
{{ render_bootstrap_form(form.subscribers_host) }}
<br>
{{ render_bootstrap_form(form.bandwidth_host) }}
<br>
{{ render_bootstrap_field(form.feedback_directory) }} {{ render_bootstrap_field(form.feedback_directory) }}
<br> <br>
{{ render_bootstrap_field(form.timeshifts_directory) }} {{ render_bootstrap_field(form.timeshifts_directory) }}