1
=== modified file 'tools/libertine-lxc-manager'
2
--- tools/libertine-lxc-manager	2016-10-25 15:24:08 +0000
3
+++ tools/libertine-lxc-manager	2016-11-01 16:53:17 +0000
4
@@ -41,7 +41,7 @@
5
41
    def __init__(self):
41
    def __init__(self):
6
42
        self.is_pulse_setup = False
42
        self.is_pulse_setup = False
7
43
        self.app_counter = Counter()
43
        self.app_counter = Counter()
9
44
        self.operation_running = {}
44
        self.operation_counter = Counter()
10
45
45
11
46
        DBusGMainLoop(set_as_default=True)
46
        DBusGMainLoop(set_as_default=True)
12
47
        try:
47
        try:
13
@@ -57,7 +57,7 @@
14
57
                         in_signature='ss',
57
                         in_signature='ss',
15
58
                         out_signature='(bs)')
58
                         out_signature='(bs)')
16
59
    def app_start(self, container_id, lxc_logfile):
59
    def app_start(self, container_id, lxc_logfile):
18
60
        if container_id in self.operation_running and self.operation_running[container_id]:
60
        if self.operation_counter[container_id] != 0:
19
61
            return (False, "Libertine container operation already running: cannot launch application.")
61
            return (False, "Libertine container operation already running: cannot launch application.")
20
62
62
21
63
        (started, reason) = self._launch_lxc_container(container_id, lxc_logfile)
63
        (started, reason) = self._launch_lxc_container(container_id, lxc_logfile)
22
@@ -86,15 +86,18 @@
23
86
        (started, reason) = self._launch_lxc_container(container_id, lxc_log_file, launchable=False)
86
        (started, reason) = self._launch_lxc_container(container_id, lxc_log_file, launchable=False)
24
87
87
25
88
        if started:
88
        if started:
27
89
            self.operation_running[container_id] = True
89
            self.operation_counter[container_id] += 1
28
90
90
29
91
        return (started, reason)
91
        return (started, reason)
30
92
92
31
93
    @dbus.service.method(LIBERTINE_LXC_MANAGER_NAME,
93
    @dbus.service.method(LIBERTINE_LXC_MANAGER_NAME,
32
94
                         in_signature='s')
94
                         in_signature='s')
33
95
    def operation_stop(self, container_id):
95
    def operation_stop(self, container_id):
36
96
        self._stop_lxc_container(container_id)
96
        self.operation_counter[container_id] -= 1
37
97
        del self.operation_running[container_id]
97
38
98
        if self.operation_counter[container_id] == 0:
39
99
            self._stop_lxc_container(container_id)
40
100
            del self.operation_counter[container_id]
41
98
101
42
99
    def _setup_pulse(self):
102
    def _setup_pulse(self):
43
100
        pulse_socket_path = os.path.join(libertine.utils.get_libertine_runtime_dir(), 'pulse_socket')
103
        pulse_socket_path = os.path.join(libertine.utils.get_libertine_runtime_dir(), 'pulse_socket')
Status:	Merged
Approved by:	Larry Price on 2016-11-02
Approved revision:	324
Merged at revision:	324
Proposed branch:	lp:~townsend/libertine/operations-counter
Merge into:	lp:libertine
Diff against target:	43 lines (+8/-5) 1 file modified tools/libertine-lxc-manager (+8/-5)
To merge this branch:	bzr merge lp:~townsend/libertine/operations-counter
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Libertine CI Bot	continuous-integration		Approve on 2016-11-03
Larry Price		2016-11-01	Approve on 2016-11-02
Review via email: mp+309774@code.launchpad.net
1	=== modified file 'tools/libertine-lxc-manager'
2	--- tools/libertine-lxc-manager 2016-10-25 15:24:08 +0000
3	+++ tools/libertine-lxc-manager 2016-11-01 16:53:17 +0000
4	@@ -41,7 +41,7 @@
5	41	def __init__(self):	41	def __init__(self):
6	42	self.is_pulse_setup = False	42	self.is_pulse_setup = False
7	43	self.app_counter = Counter()	43	self.app_counter = Counter()
9	44	self.operation_running = {}	44	self.operation_counter = Counter()
10	45		45
11	46	DBusGMainLoop(set_as_default=True)	46	DBusGMainLoop(set_as_default=True)
12	47	try:	47	try:
13	@@ -57,7 +57,7 @@
14	57	in_signature='ss',	57	in_signature='ss',
15	58	out_signature='(bs)')	58	out_signature='(bs)')
16	59	def app_start(self, container_id, lxc_logfile):	59	def app_start(self, container_id, lxc_logfile):
18	60	if container_id in self.operation_running and self.operation_running[container_id]:	60	if self.operation_counter[container_id] != 0:
19	61	return (False, "Libertine container operation already running: cannot launch application.")	61	return (False, "Libertine container operation already running: cannot launch application.")
20	62		62
21	63	(started, reason) = self._launch_lxc_container(container_id, lxc_logfile)	63	(started, reason) = self._launch_lxc_container(container_id, lxc_logfile)
22	@@ -86,15 +86,18 @@
23	86	(started, reason) = self._launch_lxc_container(container_id, lxc_log_file, launchable=False)	86	(started, reason) = self._launch_lxc_container(container_id, lxc_log_file, launchable=False)
24	87		87
25	88	if started:	88	if started:
27	89	self.operation_running[container_id] = True	89	self.operation_counter[container_id] += 1
28	90		90
29	91	return (started, reason)	91	return (started, reason)
30	92		92
31	93	@dbus.service.method(LIBERTINE_LXC_MANAGER_NAME,	93	@dbus.service.method(LIBERTINE_LXC_MANAGER_NAME,
32	94	in_signature='s')	94	in_signature='s')
33	95	def operation_stop(self, container_id):	95	def operation_stop(self, container_id):
36	96	self._stop_lxc_container(container_id)	96	self.operation_counter[container_id] -= 1
37	97	del self.operation_running[container_id]	97
38			98	if self.operation_counter[container_id] == 0:
39			99	self._stop_lxc_container(container_id)
40			100	del self.operation_counter[container_id]
41	98		101
42	99	def _setup_pulse(self):	102	def _setup_pulse(self):
43	100	pulse_socket_path = os.path.join(libertine.utils.get_libertine_runtime_dir(), 'pulse_socket')	103	pulse_socket_path = os.path.join(libertine.utils.get_libertine_runtime_dir(), 'pulse_socket')