Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #15471 from opensourcerouting/frrreload_logfile

Browse source 
tools: Add option to frr-reload to specify alternate logfile
This commit is contained in:
Christian Hopps 2025-03-30 05:52:43 -04:00 committed by GitHub
parent 285fcb903a b16752c26c
commit 1ef4f19009
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/user/frr-reload.rst
View file

@ -25,6 +25,8 @@ There are several options that control the behavior of ``frr-reload``:
* ``--stdout``: print output to stdout
* ``--bindir BINDIR``: path to the vtysh executable
* ``--confdir CONFDIR``: path to the existing daemon config files
* ``--logfile FILENAME``: file (with path) to logfile for the reload operation.
Default is ``/var/log/frr/frr-reload.log``
* ``--rundir RUNDIR``: path to a folder to be used to write the temporary files
needed by the script to do its job. The script should have write access to it
* ``--daemon DAEMON``: by default ``frr-reload.py`` assumes that we are using

13
tools/frr-reload.py
View file

@ -2113,12 +2113,17 @@ if __name__ == "__main__":
help="Use logfmt as log format",
default=False,
)
parser.add_argument(
"--logfile",
help="logfile for frr-reload",
default="/var/log/frr/frr-reload.log",
)
args = parser.parse_args()
# Logging
# For --test log to stdout
# For --reload log to /var/log/frr/frr-reload.log
# For --reload log to --logfile (default: "/var/log/frr/frr-reload.log")
# If --logfmt, use the logfmt format
formatter = logging.Formatter("%(asctime)s %(levelname)5s: %(message)s")
handler = logging.StreamHandler()
@ -2133,9 +2138,9 @@ if __name__ == "__main__":
logging.WARNING, "\033[91m%s\033[0m" % logging.getLevelName(logging.WARNING)
)
if args.reload:
if not os.path.isdir("/var/log/frr/"):
os.makedirs("/var/log/frr/", mode=0o0755)
handler = logging.FileHandler("/var/log/frr/frr-reload.log")
if not os.path.isdir(os.path.dirname(args.logfile)):
os.makedirs(os.path.dirname(args.logfile), mode=0o0755)
handler = logging.FileHandler(args.logfile)
if args.stdout:
handler = logging.StreamHandler(sys.stdout)
handler.setFormatter(formatter)