Skip to content

Commit

Permalink
Remove unknown option
Browse files Browse the repository at this point in the history
  • Loading branch information
johannaengland committed Mar 5, 2024
1 parent 7b7bc56 commit bf383cf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions NOTES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ Daemon startup privileges

By accident, some of NAV's daemons have been running as the privileged ``root``
user since NAV 4.9.0, due to changes in the process control system. NAV 5.0.4
introduces the :option:`privileged` option in the :file:`daemons.yml` configuration
introduces the ``privileged`` option in the :file:`daemons.yml` configuration
file, to signal which daemons actually need to be started with root privileges.

Only :program:`snmptrapd` and :program:`pping` need root privileges on startup,
Expand All @@ -573,7 +573,7 @@ Please ensure your :file:`daemon.yml` configuration file is updated. Also, be
aware that after upgrading to NAV 5.0.4 from any version from 4.9.0 and up, you
may have some NAV log files that are owned by ``root``, which will cause some
of the daemons to fail on startup. Please ensure all NAV log files are writable
for the user defined as :option:`NAV_USER` in :file:`nav.conf`.
for the user defined as ``NAV_USER`` in :file:`nav.conf`.


New features
Expand Down
8 changes: 4 additions & 4 deletions doc/reference/ipdevpoll.rst
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ are reserved for synchronous communication with the PostgreSQL database
backend. Even on a multi-core server, this means all of ipdevpoll's work is
limited to a single core. Once ipdevpoll's workload grows beyond what a single
core can handle, ipdevpoll can optionally run in a *multiprocess mode*, using
the :option:`--multiprocess` option.
the ``--multiprocess`` option.

In multiprocess mode, ipdevpoll spawns a number of worker processes, while the
master process becomes a simple job scheduler, distributing the actual jobs to
Expand All @@ -145,7 +145,7 @@ the individual workers.

ipdevpoll's default number of workers processes and threads aren't
necessarily sane for multiprocess usage. Unless a number of workers is
supplied to the :option:`--multiprocess` option, it will spawn a number of
supplied to the ``--multiprocess`` option, it will spawn a number of
workers corresponding to the number of cores it detects on your system. The
default number of database threads in ipdevpoll's threadpool is **10** per process,
which means each worker process will create **10 individual connections to
Expand All @@ -155,13 +155,13 @@ the individual workers.
default pool of 100 available connections, causing other NAV processes to
be unable to connect to the database. When enabling multiprocess mode, you
should really tune down the threadpool size by adding the
:option:`--threadpoolsize` option.
``--threadpoolsize`` option.


Another good thing about the multiprocess mode is that you can limit the
number of jobs any worker process will run before it is killed and respawned.
This may provide additional protection against unintended resource leaks. See
the :option:`--max-jobs-per-worker` option.
the ``--max-jobs-per-worker`` option.

You can make sure ipdevpoll always runs in multiprocess mode by altering the
``command`` option in the ``ipdevpoll`` entry of the configuration file
Expand Down

0 comments on commit bf383cf

Please sign in to comment.