Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion vmupdate/agent/entrypoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from source import plugins
from source.args import AgentArgs
from source.utils import get_os_data
from source.log_congfig import init_logs
from source.log_config import init_logs
from source.common.exit_codes import EXIT


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import os
import logging
import grp
from pathlib import Path

LOGPATH = '/var/log/qubes/qubes-update'
Expand Down Expand Up @@ -63,4 +64,12 @@ def init_logs(
log_level = "DEBUG"
log.setLevel(log_level)

try:
gid = grp.getgrnam("qubes").gr_gid
os.chown(log_path, -1, gid)
os.chmod(log_path, 0o664)
except (PermissionError, KeyError):
# do it on the best effort basis
pass

return log, log_handler, log_level, log_path, log_formatter
2 changes: 1 addition & 1 deletion vmupdate/qube_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

import qubesadmin
from vmupdate.agent.source.args import AgentArgs
from vmupdate.agent.source.log_congfig import LOGPATH, LOG_FILE
from vmupdate.agent.source.log_config import LOGPATH, LOG_FILE
from vmupdate.agent.source.status import StatusInfo, FinalStatus
from vmupdate.agent.source.common.process_result import ProcessResult

Expand Down
2 changes: 1 addition & 1 deletion vmupdate/update_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

from .agent.source.status import StatusInfo, FinalStatus, Status
from .qube_connection import QubeConnection
from vmupdate.agent.source.log_congfig import init_logs
from vmupdate.agent.source.log_config import init_logs
from vmupdate.agent.source.common.process_result import ProcessResult
from vmupdate.agent.source.common.exit_codes import EXIT

Expand Down