stackforge-attic/murano-docs
Code Issues Proposed changes

Fixed issue with sessions.

Browse Source
This commit is contained in:
Timur Nurlygayanov
2013-03-28 14:08:07 +04:00
parent fe754c613c
commit 8d3082fcdf
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tabula/tabula/templates/_service_logs.html
View File

@@ -1,5 +1,7 @@
{% load i18n %} {% load i18n %}
LOGs <div class="clearfix">
<h3 class="pull-left">{% trans "Service Logs" %}</h3>
</div>
<pre class="logs"> <pre class="logs">
{{ service.operation }} {{ service.operation }}
</pre> </pre>

18
tabula/tabula/templates/_services.html
View File

@@ -1,17 +1,7 @@
{% load i18n %} {% load i18n %}
<div class="clearfix"> <div class="clearfix">
<h3 class="pull-left">{% trans "Service Logs" %}</h3> <h3 class="pull-left">{% trans "Service Details" %}</h3>
Name: {{ service.name }}
<form id="tail_length" action="{% url horizon:project:instances:console instance.id %}" class="form-inline pull-right"> ID: {{ service.id }}
<label for="tail_length_select">{% trans "Log Length" %}</label> </div>
<input class="span1" type="text" name="length" value="35" />
<button class="btn btn-small btn-primary" type="submit">{% trans "Go" %}</button>
{% url horizon:project:instances:console instance.id as console_url %}
<a class="btn btn-small" target="_blank" href="{{ console_url }}">{% trans "View Full Log" %}</a>
</form>
</div>
<pre class="logs">
{{ service.operation }}
</pre>

6
tabula/tabula/windc/api.py
View File

@@ -81,6 +81,8 @@ def services_list(request, datacenter_id):
for s in sessions: for s in sessions:
if s.state in ['open', 'deploying']: if s.state in ['open', 'deploying']:
session_id = s.id session_id = s.id
else:
windcclient(request).sessions.delete(datacenter_id, s.id)
if session_id is None: if session_id is None:
session_id = windcclient(request).sessions.configure(datacenter_id).id session_id = windcclient(request).sessions.configure(datacenter_id).id
@@ -101,6 +103,8 @@ def get_active_directories(request, datacenter_id):
for s in sessions: for s in sessions:
if s.state in ['open', 'deploying']: if s.state in ['open', 'deploying']:
session_id = s.id session_id = s.id
else:
windcclient(request).sessions.delete(datacenter_id, s.id)
if session_id is None: if session_id is None:
session_id = windcclient(request).sessions.configure(datacenter_id).id session_id = windcclient(request).sessions.configure(datacenter_id).id
@@ -144,6 +148,8 @@ def get_status_message_for_service(request, service_id):
for s in sessions: for s in sessions:
if s.state in ['open', 'deploying']: if s.state in ['open', 'deploying']:
session_id = s.id session_id = s.id
else:
windcclient(request).sessions.delete(datacenter_id, s.id)
if session_id is None: if session_id is None:
session_id = windcclient(request).sessions.configure(datacenter_id).id session_id = windcclient(request).sessions.configure(datacenter_id).id