Jaculabilis
/
intake
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Logging improvements

This commit is contained in:
Tim Van Baak 2023-07-02 17:15:52 -07:00
parent 8da75f190c
commit 4a51aa27c6
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demo/default.nix
View File

@ -72,8 +72,10 @@
# #
# Exit the VM with ctrl+a x, or switch to the qemu console with ctrl+a c and `quit`. # Exit the VM with ctrl+a x, or switch to the qemu console with ctrl+a c and `quit`.
### ###
''; '';
users.motd = '' users.motd = ''
### ###
# To set a password for the web interface, run `intake passwd` and set a password. # To set a password for the web interface, run `intake passwd` and set a password.
# #
@ -83,5 +85,6 @@
# #
# Updating a source will also trigger intake to update the user crontab. If you run `crontab -l`, you should see that the `currenttime` source has a crontab entry. You can change this source's cron schedule in the source config. # Updating a source will also trigger intake to update the user crontab. If you run `crontab -l`, you should see that the `currenttime` source has a crontab entry. You can change this source's cron schedule in the source config.
### ###
''; '';
} }

1
intake/cli.py
View File

@ -122,6 +122,7 @@ def cmd_update(cmd_args):
if not args.dry_run: if not args.dry_run:
update_items(source, items) update_items(source, items)
else: else:
print("Update returned", len(items), "items:")
for item in items: for item in items:
print(" Item:", item._item, file=sys.stderr) print(" Item:", item._item, file=sys.stderr)
except InvalidConfigException as ex: except InvalidConfigException as ex:

4
intake/source.py
View File

@ -197,7 +197,7 @@ def _read_stdout(process: Popen, output: list) -> None:
while True: while True:
data = process.stdout.readline() data = process.stdout.readline()
if data: if data:
print(f"[stdout] <{repr(data)}>", file=sys.stderr) print(f"[stdout] {data.rstrip()}", file=sys.stderr)
output.append(data) output.append(data)
if process.poll() is not None: if process.poll() is not None:
break break
@ -211,7 +211,7 @@ def _read_stderr(process: Popen) -> None:
while True: while True:
data = process.stderr.readline() data = process.stderr.readline()
if data: if data:
print(f"[stderr] <{repr(data)}>", file=sys.stderr) print(f"[stderr] {data.rstrip()}", file=sys.stderr)
if process.poll() is not None: if process.poll() is not None:
break break