1
=== modified file 'hooks/actions.py'
2
--- hooks/actions.py	2015-06-04 15:29:02 +0000
3
+++ hooks/actions.py	2015-06-04 21:37:57 +0000
4
@@ -32,7 +32,7 @@
5
32
32
6
33
33
7
34
def log_start(service_name):
34
def log_start(service_name):
9
35
    hookenv.log('%s starting', SERVICE_NAME)
35
    hookenv.log('%s starting' % SERVICE_NAME)
10
36
36
11
37
37
12
38
def install_packages(service_name):
38
def install_packages(service_name):
13
@@ -58,7 +58,7 @@
14
58
58
15
59
def update_config_file(service_name):
59
def update_config_file(service_name):
16
60
    hookenv.log(
60
    hookenv.log(
18
61
        'Updating service configuration file: %s', SERVICE_CONFIGNAME)
61
        'Updating service configuration file: %s' % SERVICE_CONFIGNAME)
19
62
    config_content = base64.b64decode(config['config-file'])
62
    config_content = base64.b64decode(config['config-file'])
20
63
    config_path = os.path.join(_service_dir(), SERVICE_CONFIGNAME)
63
    config_path = os.path.join(_service_dir(), SERVICE_CONFIGNAME)
21
64
    with open(config_path, 'w') as f:
64
    with open(config_path, 'w') as f:
22
@@ -67,7 +67,7 @@
23
67
67
24
68
def create_user(service_name):
68
def create_user(service_name):
25
69
    username = 'core-worker'
69
    username = 'core-worker'
27
70
    hookenv.log('Creating service user: %s', username)
70
    hookenv.log('Creating service user: %s' % username)
28
71
    adduser(username)
71
    adduser(username)
29
72
72
30
73
    # create user's home directory if it doesn't exist.
73
    # create user's home directory if it doesn't exist.
Status:	Merged
Approved by:	Joe Talbott on 2015-06-04
Approved revision:	8
Merged at revision:	8
Proposed branch:	lp:~joetalbott/charms/trusty/snappy-proposed-image-builder/fix_logging
Merge into:	lp:~canonical-ci-engineering/charms/trusty/snappy-proposed-image-builder/trunk
Diff against target:	30 lines (+3/-3) 1 file modified hooks/actions.py (+3/-3)
To merge this branch:	bzr merge lp:~joetalbott/charms/trusty/snappy-proposed-image-builder/fix_logging
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Thomi Richards (community)		2015-06-04	Approve on 2015-06-04
Review via email: mp+261154@code.launchpad.net
1	=== modified file 'hooks/actions.py'
2	--- hooks/actions.py 2015-06-04 15:29:02 +0000
3	+++ hooks/actions.py 2015-06-04 21:37:57 +0000
4	@@ -32,7 +32,7 @@
5	32		32
6	33		33
7	34	def log_start(service_name):	34	def log_start(service_name):
9	35	hookenv.log('%s starting', SERVICE_NAME)	35	hookenv.log('%s starting' % SERVICE_NAME)
10	36		36
11	37		37
12	38	def install_packages(service_name):	38	def install_packages(service_name):
13	@@ -58,7 +58,7 @@
14	58		58
15	59	def update_config_file(service_name):	59	def update_config_file(service_name):
16	60	hookenv.log(	60	hookenv.log(
18	61	'Updating service configuration file: %s', SERVICE_CONFIGNAME)	61	'Updating service configuration file: %s' % SERVICE_CONFIGNAME)
19	62	config_content = base64.b64decode(config['config-file'])	62	config_content = base64.b64decode(config['config-file'])
20	63	config_path = os.path.join(_service_dir(), SERVICE_CONFIGNAME)	63	config_path = os.path.join(_service_dir(), SERVICE_CONFIGNAME)
21	64	with open(config_path, 'w') as f:	64	with open(config_path, 'w') as f:
22	@@ -67,7 +67,7 @@
23	67		67
24	68	def create_user(service_name):	68	def create_user(service_name):
25	69	username = 'core-worker'	69	username = 'core-worker'
27	70	hookenv.log('Creating service user: %s', username)	70	hookenv.log('Creating service user: %s' % username)
28	71	adduser(username)	71	adduser(username)
29	72		72
30	73	# create user's home directory if it doesn't exist.	73	# create user's home directory if it doesn't exist.