1
=== modified file 'python/libertine/ContainersConfig.py'
2
--- python/libertine/ContainersConfig.py	2017-02-23 21:08:28 +0000
3
+++ python/libertine/ContainersConfig.py	2017-03-29 16:52:33 +0000
4
@@ -14,42 +14,77 @@
5
14
14
6
15
import fcntl
15
import fcntl
7
16
import json
16
import json
8
17
import libertine.utils
9
18
import os
17
import os
10
19
import sys
18
import sys
11
19
import errno
12
20
import time
13
21
14
20
from hashlib import md5
22
from hashlib import md5
16
21
from libertine.HostInfo import HostInfo
23
from . import utils, HostInfo
17
24
18
25
class _ContainersConfigFile(object):
19
26
    def __init__(self, readonly=True):
20
27
        self._readonly = readonly
21
28
22
29
        if readonly:
23
30
            self._flags = 'r'
24
31
        else:
25
32
            self._flags = 'w'
26
33
27
34
        self._fd = None
28
35
29
36
    def __enter__(self):
30
37
        container_config_file = utils.get_libertine_database_file_path()
31
38
        if self._readonly and (not os.path.exists(container_config_file) or
32
39
                               os.path.getsize(container_config_file) == 0):
33
40
            return None
34
41
35
42
        retries = 0
36
43
        while retries < 100:
37
44
            try:
38
45
                fd = open(container_config_file, self._flags)
39
46
                fcntl.flock(fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
40
47
41
48
                self._fd = fd
42
49
                return self._fd
43
50
            except IOError as e:
44
51
                if e.errno != errno.EAGAIN:
45
52
                    raise
46
53
                else:
47
54
                    fd.close()
48
55
                    retries += 1
49
56
                    time.sleep(0.05)
50
57
51
58
    def __exit__(self, *args):
52
59
        if self._fd:
53
60
            self._fd.close()
54
22
61
55
23
62
56
24
def read_container_config_file():
63
def read_container_config_file():
57
25
    container_list = {}
64
    container_list = {}
64
26
    container_config_file = libertine.utils.get_libertine_database_file_path()
65
    with _ContainersConfigFile() as fd:
65
27
66
        if fd is not None:
60
28
    if (os.path.exists(container_config_file) and
61
29
        os.path.getsize(container_config_file) != 0):
62
30
        with open(container_config_file, 'r') as fd:
63
31
            fcntl.flock(fd, fcntl.LOCK_EX)
66
32
            container_list = json.load(fd)
67
            container_list = json.load(fd)
67
33
68
68
34
    return container_list
69
    return container_list
69
35
70
70
36
71
71
37
def write_container_config_file(container_list):
72
def write_container_config_file(container_list):
73
38
    container_config_file = libertine.utils.get_libertine_database_file_path()
73
    container_config_file = utils.get_libertine_database_file_path()
74
39
74
75
40
    # Add a warning to adventurous users advising against mucking with this file
75
    # Add a warning to adventurous users advising against mucking with this file
76
41
    if container_list is not None:
76
    if container_list is not None:
77
42
        container_list["_warning"] = "This file is automatically generated by Libertine and should not be manually edited."
77
        container_list["_warning"] = "This file is automatically generated by Libertine and should not be manually edited."
78
43
78
83
44
    with open(container_config_file, 'w') as fd:
79
    with _ContainersConfigFile(False) as fd:
84
45
        fcntl.flock(fd, fcntl.LOCK_EX)
80
        if fd:
85
46
        json.dump(container_list, fd, sort_keys=True, indent=4)
81
            json.dump(container_list, fd, sort_keys=True, indent=4)
86
47
        fd.write('\n')
82
            fd.write('\n')
87
48
83
88
49
84
89
50
def container_config_hash():
85
def container_config_hash():
90
51
    checksum = md5()
86
    checksum = md5()
92
52
    container_config_file = libertine.utils.get_libertine_database_file_path()
87
    container_config_file = utils.get_libertine_database_file_path()
93
53
    if (os.path.exists(container_config_file) and os.path.getsize(container_config_file) != 0):
88
    if (os.path.exists(container_config_file) and os.path.getsize(container_config_file) != 0):
94
54
        with open(container_config_file, "rb") as fd:
89
        with open(container_config_file, "rb") as fd:
95
55
            fcntl.flock(fd, fcntl.LOCK_EX)
90
            fcntl.flock(fd, fcntl.LOCK_EX)
96
@@ -214,12 +249,12 @@
97
214
249
98
215
    def check_container_id(self, container_id):
250
    def check_container_id(self, container_id):
99
216
        if container_id and not self.container_exists(container_id):
251
        if container_id and not self.container_exists(container_id):
101
217
            libertine.utils.get_logger().error("Container id \'%s\' does not exist." % container_id)
252
            utils.get_logger().error("Container id '{container_id}' does not exist.".format(container_id=container_id))
102
218
            sys.exit(1)
253
            sys.exit(1)
103
219
        elif not container_id:
254
        elif not container_id:
104
220
            container_id = self.get_default_container_id()
255
            container_id = self.get_default_container_id()
105
221
            if container_id is None:
256
            if container_id is None:
107
222
                libertine.utils.get_logger().error("No default container available.")
257
                utils.get_logger().error("No default container available.")
108
223
                sys.exit(1)
258
                sys.exit(1)
109
224
259
110
225
        return container_id
260
        return container_id
111
@@ -263,7 +298,7 @@
112
263
298
113
264
    def delete_container(self, container_id):
299
    def delete_container(self, container_id):
114
265
        if not self.container_list:
300
        if not self.container_list:
116
266
            libertine.utils.get_logger().error("Unable to delete container.  No containers defined.")
301
            utils.get_logger().error("Unable to delete container. No containers defined.")
117
267
            sys.exit(1)
302
            sys.exit(1)
118
268
303
119
269
        container = self._get_container_entry(container_id)
304
        container = self._get_container_entry(container_id)
Reviewer	Review Type	Date Requested	Status
Christopher Townsend		2017-03-29	Approve on 2017-03-29
Libertine CI Bot	continuous-integration		Approve on 2017-03-29
Review via email: mp+321329@code.launchpad.net