Sun, 21 Jan 2018 13:34:12 +0000
More logging detail
| 0 | 1 | # |
| 2 | # Borgend borg launcher / processor | |
| 3 | # | |
| 4 | ||
| 5 | import json | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
6 | import logging |
|
20
fdfbe5d7b677
Keychain support and random fixes
Tuomo Valkonen <tuomov@iki.fi>
parents:
12
diff
changeset
|
7 | import os |
| 2 | 8 | from subprocess import Popen, PIPE |
| 9 | from config import settings, arglistify | |
| 0 | 10 | |
| 31 | 11 | logger=logging.getLogger(__name__) |
| 12 | ||
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
13 | necessary_opts=['--log-json', '--progress'] |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
14 | |
| 7 | 15 | necessary_opts_for={ |
| 16 | 'create': ['--json'], | |
| 17 | 'info': ['--json'], | |
| 18 | 'list': ['--json'], | |
| 19 | } | |
| 20 | ||
| 0 | 21 | class BorgInstance: |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
22 | def __init__(self, operation, archive_or_repository, args, argsl): |
| 0 | 23 | self.operation=operation; |
| 24 | self.args=args; | |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
25 | self.archive_or_repository=archive_or_repository; |
| 2 | 26 | self.argsl=argsl; |
| 0 | 27 | |
| 28 | def construct_cmdline(self): | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
29 | cmd=([settings['borg']['executable']]+necessary_opts+ |
| 2 | 30 | arglistify(settings['borg']['common_parameters'])+ |
| 31 | [self.operation]) | |
| 32 | tmp1=self.operation+'_parameters' | |
| 33 | if tmp1 in settings['borg']: | |
| 34 | cmd=cmd+arglistify(settings['borg'][tmp1]) | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
35 | |
| 7 | 36 | if self.operation in necessary_opts_for: |
| 37 | cmd=cmd+necessary_opts_for[self.operation] | |
| 38 | ||
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
39 | return cmd+arglistify(self.args)+[self.archive_or_repository]+self.argsl |
| 0 | 40 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
41 | def launch(self, passphrase=None): |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
42 | cmd=self.construct_cmdline() |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
43 | |
| 31 | 44 | logger.info('Launching ' + str(cmd)) |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
45 | |
| 29 | 46 | env=os.environ.copy() |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
47 | if passphrase: |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
48 | env['BORG_PASSPHRASE']=passphrase |
|
20
fdfbe5d7b677
Keychain support and random fixes
Tuomo Valkonen <tuomov@iki.fi>
parents:
12
diff
changeset
|
49 | |
|
24
94d58d514d69
Workaround to PYTHONPATH and PYTHONHOME being messed up by py2app.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
50 | # Workaround: if launched is a standalone app created with py2app, |
|
94d58d514d69
Workaround to PYTHONPATH and PYTHONHOME being messed up by py2app.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
51 | # borg will fail unless Python environment is reset. |
|
94d58d514d69
Workaround to PYTHONPATH and PYTHONHOME being messed up by py2app.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
52 | # TODO: Of course, this will fail if the system needs the variables |
|
94d58d514d69
Workaround to PYTHONPATH and PYTHONHOME being messed up by py2app.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
53 | # PYTHONPATH or PYTHONHOME set to certain values. |
| 29 | 54 | if '_PY2APP_LAUNCHED_' in env: |
| 55 | val=env['_PY2APP_LAUNCHED_'] | |
| 56 | if val=='1': | |
| 57 | del env['PYTHONPATH'] | |
| 58 | del env['PYTHONHOME'] | |
|
24
94d58d514d69
Workaround to PYTHONPATH and PYTHONHOME being messed up by py2app.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
59 | |
|
20
fdfbe5d7b677
Keychain support and random fixes
Tuomo Valkonen <tuomov@iki.fi>
parents:
12
diff
changeset
|
60 | self.proc=Popen(cmd, env=env, stdout=PIPE, stderr=PIPE, stdin=PIPE) |
| 12 | 61 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
62 | # We don't do passphrase input etc. |
| 12 | 63 | self.proc.stdin.close() |
| 0 | 64 | |
| 7 | 65 | def read_result(self): |
| 66 | stream=self.proc.stdout | |
| 67 | line=stream.read(-1) | |
| 68 | if line==b'': | |
| 31 | 69 | logger.debug('Borg stdout pipe EOF?') |
| 7 | 70 | return None |
| 71 | ||
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
72 | try: |
| 7 | 73 | return json.loads(line) |
| 74 | except: | |
| 31 | 75 | logger.warning('JSON parse failed on: "%s"' % line) |
| 7 | 76 | return None |
| 77 | ||
| 78 | def read_log(self): | |
| 79 | stream=self.proc.stderr | |
| 80 | try: | |
| 81 | line=stream.readline() | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
82 | except err: |
| 31 | 83 | logger.debug('Pipe read failed: %s' % str(err)) |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
84 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
85 | return {'type': 'log_message', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
86 | 'levelname': 'CRITICAL', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
87 | 'name': 'borgend.instance.BorgInstance', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
88 | 'msgid': 'Borgend.Exception', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
89 | 'message': err} |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
90 | |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
91 | if line==b'': |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
92 | |
| 31 | 93 | logger.debug('Borg stderr pipe EOF?') |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
94 | |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
95 | return None |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
96 | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
97 | try: |
| 6 | 98 | res=json.loads(line) |
| 99 | if 'type' not in res: | |
| 100 | res['type']='UNKNOWN' | |
| 101 | return res | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
102 | except: |
| 31 | 103 | logger.debug('JSON parse failed on: "%s"' % str(line)) |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
104 | |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
105 | errmsg=line |
| 7 | 106 | for line in iter(stream.readline, b''): |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
107 | errmsg=errmsg+line |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
108 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
109 | return {'type': 'log_message', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
110 | 'levelname': 'ERROR', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
111 | 'name': 'borgend.instance.BorgInstance', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
112 | 'msgid': 'Borgend.JSONFail', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
113 | 'message': str(errmsg)} |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
114 | |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
115 | def terminate(self): |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
116 | self.proc.terminate() |
| 0 | 117 | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
118 | def wait(self): |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
119 | return self.proc.wait() is not None |
| 0 | 120 | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
121 | def has_terminated(self): |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
122 | return self.proc.poll() is not None |
| 0 | 123 |