Unverified Commit e892ef30 authored by intrigeri's avatar intrigeri
Browse files

Have tor log to the Journal

Dropping tordate removed the only reason why we still had to make tor log to its
own log file, instead of to the Journal. This log split makes it harder than
necessary to debug stuff, so let's converge to the Journal.

refs #18842
parent 635f56d1
......@@ -30,10 +30,8 @@ AvoidDiskWrites 1
## users to click through security warnings.
WarnPlaintextPorts 23,109
## Tor 0.3.x logs to syslog by default, which we redirect to the Journal;
## but we have some code that reads Tor's logs and only supports plaintext
## log files at the moment, so let's keep logging to a file.
Log notice file /var/log/tor/log
## Log to the systemd Journal
Log notice syslog
## Tor Launcher will enable the network access for Tor once the user
## has provided the configuration they desire.
......
......@@ -235,13 +235,6 @@ def save_tor_journal
file.write("Tor Journal\n")
file.write("===========\n")
file.write($vm.file_content('/tmp/tor.journal') + "\n")
file.write("Tor logs (/var/log/tor/log)\n")
file.write("===========================\n")
if $vm.file_exist?('/var/log/tor/log')
file.write($vm.file_content('/var/log/tor/log'))
else
file.write("The Tor logs did not exist\n")
end
end
end
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment