1
=== modified file 'called-by-tarmac.py'
2
--- called-by-tarmac.py	2015-05-20 22:06:09 +0000
3
+++ called-by-tarmac.py	2015-05-22 16:26:21 +0000
4
@@ -59,6 +59,12 @@
5
59
        pip_cache = os.path.join(pip_dir, 'cache')
59
        pip_cache = os.path.join(pip_dir, 'cache')
6
60
        all_cmds = (
60
        all_cmds = (
7
61
            [
61
            [
8
62
                'bzr',
9
63
                'branch',
10
64
                PIP_CACHE_BRANCH,
11
65
                pip_cache,
12
66
            ],
13
67
            [
14
62
                'virtualenv',
68
                'virtualenv',
15
63
                '-p',
69
                '-p',
16
64
                'python3',
70
                'python3',
17
65
71
18
=== modified file 'core_selftest_agent/__init__.py'
19
--- core_selftest_agent/__init__.py	2015-05-20 17:30:07 +0000
20
+++ core_selftest_agent/__init__.py	2015-05-22 16:26:21 +0000
21
@@ -15,6 +15,50 @@
22
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
23
16
#
16
#
24
17
17
25
18
import argparse
26
19
import configparser
27
20
import logging
28
21
import os
29
22
30
23
from uservice_utils.logging import (
31
24
    configure_service_logging,
32
25
    ExtraLogger,
33
26
)
34
27
35
28
from core_selftest_agent import constants
36
29
37
30
38
31
def read_config():
39
32
    parser = argparse.ArgumentParser(description='Core Selftest Agent.')
40
33
    parser.add_argument(
41
34
        '-c',
42
35
        '--conf',
43
36
        default='core-service.conf',
44
37
        help='Configuration file path'
45
38
    )
46
39
    args = parser.parse_args()
47
40
48
41
    # Load configuration options.
49
42
    config = configparser.ConfigParser()
50
43
    config.read(args.conf)
51
44
    return config
52
45
53
46
54
47
def get_logger(name, extra={}):
55
48
    if logging.getLoggerClass() != ExtraLogger:
56
49
        logging.setLoggerClass(ExtraLogger)
57
50
    logger = logging.getLogger(name)
58
51
    e = constants.LOGGING_EXTRA.copy()
59
52
    e.update(extra)
60
53
    logger.set_extra_args(e)
61
54
    return logger
62
55
63
18
56
64
19
def main():
57
def main():
66
20
    pass
58
    config = read_config()
67
59
    log_path = os.path.abspath(
68
60
        os.path.join(__file__, '../../logs/core-selftest-agent.log'))
69
61
    configure_service_logging(
70
62
        log_path,
71
63
        config['logstash'] if 'logstash' in config else None
72
64
    )
73
21
65
74
=== added file 'core_selftest_agent/constants.py'
75
--- core_selftest_agent/constants.py	1970-01-01 00:00:00 +0000
76
+++ core_selftest_agent/constants.py	2015-05-22 16:26:21 +0000
77
@@ -0,0 +1,42 @@
78
1
# core-selftest-agent
79
2
# Copyright (C) 2015 Canonical
80
3
#
81
4
# This program is free software: you can redistribute it and/or modify
82
5
# it under the terms of the GNU General Public License as published by
83
6
# the Free Software Foundation, either version 3 of the License, or
84
7
# (at your option) any later version.
85
8
#
86
9
# This program is distributed in the hope that it will be useful,
87
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
88
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
89
12
# GNU General Public License for more details.
90
13
#
91
14
# You should have received a copy of the GNU General Public License
92
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
93
16
#
94
17
95
18
"""Constants for this service."""
96
19
import socket
97
20
98
21
# Queue names are constant, rather than being defined in the config.
99
22
100
23
# The queue we listen to for new payloads to check:
101
24
INPUT_QUEUE = "pm.candidates"
102
25
103
26
# The queue we send events on to request image build and test
104
27
OUTPUT_QUEUE = "core.package.v1"
105
28
106
29
# The queue we put fatally error'd payloads into:
107
30
DEAD_LETTER_QUEUE = "core.deadletters.v1"
108
31
109
32
SOLUTION_NAME = "core-image-testing"
110
33
111
34
SERVICE_NAME = "core-selftest-agent"
112
35
113
36
HOSTNAME = socket.gethostname().replace('-machine', '')
114
37
115
38
LOGGING_EXTRA = {
116
39
    'solution': SOLUTION_NAME,
117
40
    'service': SERVICE_NAME,
118
41
    'hostname': HOSTNAME,
119
42
}
120
0
43
121
=== modified file 'requirements.txt'
122
--- requirements.txt	2015-05-20 17:10:57 +0000
123
+++ requirements.txt	2015-05-22 16:26:21 +0000
124
@@ -0,0 +1,2 @@
125
1
python-logstash==0.4.2
126
2
uservice-utils==1.0.2.1
Status:	Merged
Approved by:	Paul Larson on 2015-05-22
Approved revision:	9
Merged at revision:	5
Proposed branch:	lp:~pwlars/core-selftest-agent/agent-config
Merge into:	lp:core-selftest-agent
Diff against target:	126 lines (+95/-1) 4 files modified called-by-tarmac.py (+6/-0) core_selftest_agent/__init__.py (+45/-1) core_selftest_agent/constants.py (+42/-0) requirements.txt (+2/-0)
To merge this branch:	bzr merge lp:~pwlars/core-selftest-agent/agent-config
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Para Siva (community)		Approve on 2015-05-22
Paul Larson		Needs Resubmitting on 2015-05-22
Francis Ginther	2015-05-21	Approve on 2015-05-21
Review via email: mp+259799@code.launchpad.net