1
=== modified file 'data/CMakeLists.txt'
2
--- data/CMakeLists.txt	2017-01-31 16:28:31 +0000
3
+++ data/CMakeLists.txt	2017-04-04 18:44:41 +0000
4
@@ -8,5 +8,10 @@
5
8
        DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
8
        DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
6
9
install(FILES libertine-lxc-sudo libertine-lxd-sudo
9
install(FILES libertine-lxc-sudo libertine-lxd-sudo
7
10
        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sudoers.d)
10
        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sudoers.d)
8
11
9
12
# libertined
10
11
install(FILES com.canonical.libertine.Service.service
13
install(FILES com.canonical.libertine.Service.service
11
12
        DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services)
14
        DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services)
12
15
pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
13
16
install(FILES libertine.service
14
17
        DESTINATION ${SYSTEMD_USER_DIR}/)
15
13
18
16
=== modified file 'data/com.canonical.libertine.Service.service'
17
--- data/com.canonical.libertine.Service.service	2017-01-20 20:37:02 +0000
18
+++ data/com.canonical.libertine.Service.service	2017-04-04 18:44:41 +0000
19
@@ -1,3 +1,4 @@
20
1
[D-BUS Service]
1
[D-BUS Service]
21
2
Name=com.canonical.libertine.Service
2
Name=com.canonical.libertine.Service
23
3
Exec=/usr/bin/libertined --cache-output
3
Exec=/usr/bin/libertined
24
4
SystemdService=libertine.service
25
4
5
26
=== added file 'data/libertine.service'
27
--- data/libertine.service	1970-01-01 00:00:00 +0000
28
+++ data/libertine.service	2017-04-04 18:44:41 +0000
29
@@ -0,0 +1,7 @@
30
1
[Unit]
31
2
Description=Libertine Service
32
3
33
4
[Service]
34
5
Type=dbus
35
6
BusName=com.canonical.libertine.Service
36
7
ExecStart=/usr/bin/libertined
37
0
8
38
=== modified file 'debian/libertined.install'
39
--- debian/libertined.install	2017-01-20 18:43:08 +0000
40
+++ debian/libertined.install	2017-04-04 18:44:41 +0000
41
@@ -1,3 +1,4 @@
42
1
usr/bin/libertined
1
usr/bin/libertined
43
2
usr/lib/python*/*/libertine/service
2
usr/lib/python*/*/libertine/service
44
3
usr/share/dbus-1/services/com.canonical.libertine.Service.service
3
usr/share/dbus-1/services/com.canonical.libertine.Service.service
45
4
usr/lib/systemd/user
46
4
5
47
=== modified file 'tests/integration/test_libertine_service.py'
48
--- tests/integration/test_libertine_service.py	2017-03-27 20:51:17 +0000
49
+++ tests/integration/test_libertine_service.py	2017-04-04 18:44:41 +0000
50
@@ -43,7 +43,7 @@
51
43
        cls._tempdir = tempfile.TemporaryDirectory()
43
        cls._tempdir = tempfile.TemporaryDirectory()
52
44
44
53
45
        os.environ['XDG_DATA_HOME'] = cls._tempdir.name
45
        os.environ['XDG_DATA_HOME'] = cls._tempdir.name
55
46
        cls._process = pexpect.spawnu('libertined --debug', env=os.environ.copy())
46
        cls._process = pexpect.spawnu('libertined', env=os.environ.copy())
56
47
        cls._process.logfile = sys.stdout
47
        cls._process.logfile = sys.stdout
57
48
48
58
49
        # give libertined enough time to start the whole process
49
        # give libertined enough time to start the whole process
59
50
50
60
=== modified file 'tests/integration/test_liblibertine.cpp'
61
--- tests/integration/test_liblibertine.cpp	2017-03-07 18:38:05 +0000
62
+++ tests/integration/test_liblibertine.cpp	2017-04-04 18:44:41 +0000
63
@@ -30,7 +30,6 @@
64
30
  static void SetUpTestCase()
30
  static void SetUpTestCase()
65
31
  {
31
  {
66
32
    process = dbus_test_process_new("libertined");
32
    process = dbus_test_process_new("libertined");
67
33
    dbus_test_process_append_param(process, "--debug");
68
34
33
69
35
    dbus_test_task_set_bus(DBUS_TEST_TASK(process), DBUS_TEST_SERVICE_BUS_SESSION);
34
    dbus_test_task_set_bus(DBUS_TEST_TASK(process), DBUS_TEST_SERVICE_BUS_SESSION);
70
36
    dbus_test_task_set_name(DBUS_TEST_TASK(process), "libertine");
35
    dbus_test_task_set_name(DBUS_TEST_TASK(process), "libertine");
71
37
36
72
=== modified file 'tools/libertined'
73
--- tools/libertined	2017-03-27 20:06:39 +0000
74
+++ tools/libertined	2017-04-04 18:44:41 +0000
75
@@ -28,89 +28,15 @@
76
28
from libertine.service import constants, operations, container_control, container_control_client
28
from libertine.service import constants, operations, container_control, container_control_client
77
29
29
78
30
30
79
31
class OutputRedirector(object):
80
32
    def __init__(self, config):
81
33
        self.config = config
82
34
        if utils.is_snap_environment():
83
35
            self.cache_path = '%s/.cache/libertined' % os.environ['SNAP_USER_COMMON']
84
36
        else:
85
37
            self.cache_path = '%s/.cache/libertined' % os.environ['HOME']
86
38
        self.cache_file = '%s/libertined.log' % self.cache_path
87
39
        self.output_file = None
88
40
        self.copied_stdout = None
89
41
        self.copied_stderr = None
90
42
91
43
    def _fileno(self, file_or_fd):
92
44
        return getattr(file_or_fd, 'fileno', lambda: file_or_fd)()
93
45
94
46
    def _do_redirect(self, stream):
95
47
        fd = self._fileno(stream)
96
48
        copied_stream = os.fdopen(os.dup(fd), 'wb')
97
49
        stream.flush()
98
50
        os.dup2(self._fileno(self.output_file), fd)
99
51
        return copied_stream, fd
100
52
101
53
    def _undo_redirect(self, stream, stream_fd, copied_stream):
102
54
        stream.flush()
103
55
        os.dup2(copied_stream.fileno(), stream_fd)
104
56
        copied_stream.close()
105
57
106
58
    def _rotate_logs(self):
107
59
        os.makedirs(self.cache_path, exist_ok=True)
108
60
        num_backups = 3
109
61
        for i in range(num_backups, 0, -1):
110
62
            filename = '%s.%i' % (self.cache_file, i)
111
63
            if os.path.exists(filename):
112
64
                if i == num_backups:
113
65
                    os.remove(filename)
114
66
                else:
115
67
                    os.rename(filename, '%s.%i' % (self.cache_file, i+1))
116
68
        if os.path.exists(self.cache_file):
117
69
            os.rename(self.cache_file, '%s.1' % self.cache_file)
118
70
119
71
    def __enter__(self):
120
72
        utils.set_environmental_verbosity(self.config.verbosity)
121
73
122
74
        if not self.config.debug:
123
75
            if self.config.cache_output:
124
76
                self._rotate_logs()
125
77
                self.output_file = open(self.cache_file, 'w')
126
78
            else:
127
79
                self.output_file = open(os.devnull, 'w')
128
80
129
81
            self.copied_stdout, self.stdout_fd = self._do_redirect(sys.stdout)
130
82
            self.copied_stderr, self.stderr_fd = self._do_redirect(sys.stderr)
131
83
132
84
    def __exit__(self, type, value, tb):
133
85
        if self.copied_stdout and self.stdout_fd:
134
86
            self._undo_redirect(sys.stdout, self.stdout_fd, self.copied_stdout)
135
87
        if self.copied_stderr and self.stderr_fd:
136
88
            self._undo_redirect(sys.stderr, self.stderr_fd, self.copied_stderr)
137
89
        if self.output_file:
138
90
            self.output_file.close()
139
91
140
92
141
93
class Config(object):
31
class Config(object):
142
94
  def __init__(self):
32
  def __init__(self):
143
95
    self._arg_parser = argparse.ArgumentParser(description=u'Libertine Store service')
33
    self._arg_parser = argparse.ArgumentParser(description=u'Libertine Store service')
144
96
    self._arg_parser.add_argument(u'-l', u"--use-local-cache",
145
97
                                  action='store_true',
146
98
                                  default=False,
147
99
                                  help=u"use local cache instead of system cache")
148
100
    self._arg_parser.add_argument(u'-d', u"--debug",
149
101
                                  action='store_true',
150
102
                                  default=False,
151
103
                                  help=u"print output to stdout")
152
104
    self._arg_parser.add_argument('-q', '--quiet', action='store_const',
34
    self._arg_parser.add_argument('-q', '--quiet', action='store_const',
153
105
                                  dest='verbosity', const=0,
35
                                  dest='verbosity', const=0,
154
106
                                  help=('disables all non-vital output'))
36
                                  help=('disables all non-vital output'))
155
107
    self._arg_parser.add_argument('-v', '--verbosity', action='store_const',
37
    self._arg_parser.add_argument('-v', '--verbosity', action='store_const',
156
108
                                  dest='verbosity', const=2,
38
                                  dest='verbosity', const=2,
157
109
                                  help=('enables debug output'))
39
                                  help=('enables debug output'))
158
110
    self._arg_parser.add_argument(u'-c', u"--cache-output",
159
111
                                  action='store_true',
160
112
                                  default=False,
161
113
                                  help=u"Log to $HOME/.cache/libertined/ instead of stdout")
162
114
    args = self._arg_parser.parse_args(namespace=Config)
40
    args = self._arg_parser.parse_args(namespace=Config)
163
115
41
164
116
42
165
@@ -139,31 +65,30 @@
166
139
def main():
65
def main():
167
140
    config = Config()
66
    config = Config()
168
141
67
194
142
    with OutputRedirector(config):
68
    utils.get_logger().info("Initializing libertined...")
195
143
        utils.get_logger().info("Initializing libertined...")
69
    loop = Loop()
196
144
        loop = Loop()
70
197
145
71
    try:
198
146
        try:
72
        bus_name = dbus.service.BusName(constants.SERVICE_NAME,
199
147
            bus_name = dbus.service.BusName(constants.SERVICE_NAME,
73
                                        bus=dbus.SessionBus(),
200
148
                                            bus=dbus.SessionBus(),
74
                                        do_not_queue=True)
201
149
                                            do_not_queue=True)
75
    except dbus.exceptions.NameExistsException:
202
150
        except dbus.exceptions.NameExistsException:
76
        utils.get_logger().warning("service is already running")
203
151
            utils.get_logger().warning("service is already running")
77
        raise
204
152
            raise
78
205
153
79
    client = container_control_client.ContainerControlClient()
206
154
        client = container_control_client.ContainerControlClient()
80
    manager = operations.Operations(bus_name, client)
207
155
        manager = operations.Operations(bus_name, client)
81
    container_control.ContainerControl(manager.connection, client)
208
156
        container_control.ContainerControl(manager.connection, client)
82
209
157
83
    try:
210
158
        try:
84
        utils.get_logger().info("libertined ready")
211
159
            utils.get_logger().info("libertined ready")
85
        loop.run()
212
160
            loop.run()
86
    except KeyboardInterrupt:
213
161
        except KeyboardInterrupt:
87
        utils.get_logger().debug("keyboard interrupt received")
214
162
            utils.get_logger().debug("keyboard interrupt received")
88
    except Exception as e:
215
163
        except Exception as e:
89
        utils.get_logger().error("Unexpected exception occurred: '{}'".format(str(e)))
216
164
            utils.get_logger().error("Unexpected exception occurred: '{}'".format(str(e)))
90
    finally:
217
165
        finally:
91
        loop.shutdown()
193
166
            loop.shutdown()
218
167
92
219
168
93
220
169
if __name__ == '__main__':
94
if __name__ == '__main__':
Reviewer	Review Type	Date Requested	Status
Christopher Townsend		2017-04-03	Approve on 2017-04-04
Libertine CI Bot	continuous-integration		Approve on 2017-04-04
Review via email: mp+321780@code.launchpad.net