picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

meson: define @HIGH_RLIMIT_NOFILE@ and use it everywhere

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-10-17 10:21:48 +02:00
parent c8884aceef
commit c02b6ee496
8 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -75,6 +75,7 @@ conf.set10('HAVE_SYSV_COMPAT', sysvinit_path != '' and sysvrcnd_path != '',
conf.set10('BUMP_PROC_SYS_FS_FILE_MAX', get_option('bump-proc-sys-fs-file-max')) conf.set10('BUMP_PROC_SYS_FS_FILE_MAX', get_option('bump-proc-sys-fs-file-max'))
conf.set10('BUMP_PROC_SYS_FS_NR_OPEN', get_option('bump-proc-sys-fs-nr-open')) conf.set10('BUMP_PROC_SYS_FS_NR_OPEN', get_option('bump-proc-sys-fs-nr-open'))
conf.set('HIGH_RLIMIT_NOFILE', 256*1024)
# join_paths ignore the preceding arguments if an absolute component is # join_paths ignore the preceding arguments if an absolute component is
# encountered, so this should canonicalize various paths when they are # encountered, so this should canonicalize various paths when they are
@ -272,6 +273,7 @@ substs.set('SYSTEM_SYSVRCND_PATH', sysvrcnd_path)
substs.set('RC_LOCAL_SCRIPT_PATH_START', get_option('rc-local')) substs.set('RC_LOCAL_SCRIPT_PATH_START', get_option('rc-local'))
substs.set('RC_LOCAL_SCRIPT_PATH_STOP', get_option('halt-local')) substs.set('RC_LOCAL_SCRIPT_PATH_STOP', get_option('halt-local'))
substs.set('MEMORY_ACCOUNTING_DEFAULT', memory_accounting_default ? 'yes' : 'no') substs.set('MEMORY_ACCOUNTING_DEFAULT', memory_accounting_default ? 'yes' : 'no')
substs.set('HIGH_RLIMIT_NOFILE', conf.get('HIGH_RLIMIT_NOFILE'))
##################################################################### #####################################################################

1
src/basic/def.h
View file

@ -76,5 +76,4 @@
#define LONG_LINE_MAX (1U*1024U*1024U) #define LONG_LINE_MAX (1U*1024U*1024U)
#define HIGH_RLIMIT_NOFILE (256*1024)
#define HIGH_RLIMIT_MEMLOCK (1024ULL*1024ULL*64ULL) #define HIGH_RLIMIT_MEMLOCK (1024ULL*1024ULL*64ULL)

2
src/core/system.conf.in
View file

@ -53,7 +53,7 @@
#DefaultLimitSTACK= #DefaultLimitSTACK=
#DefaultLimitCORE= #DefaultLimitCORE=
#DefaultLimitRSS= #DefaultLimitRSS=
#DefaultLimitNOFILE= #DefaultLimitNOFILE=1024:@HIGH_RLIMIT_NOFILE@
#DefaultLimitAS= #DefaultLimitAS=
#DefaultLimitNPROC= #DefaultLimitNPROC=
#DefaultLimitMEMLOCK= #DefaultLimitMEMLOCK=

2
units/systemd-journal-gatewayd.service.in
View file

@ -32,7 +32,7 @@ LockPersonality=yes
# If there are many split up journal files we need a lot of fds to access them # If there are many split up journal files we need a lot of fds to access them
# all in parallel. # all in parallel.
LimitNOFILE=262144 LimitNOFILE=@HIGH_RLIMIT_NOFILE@
[Install] [Install]
Also=systemd-journal-gatewayd.socket Also=systemd-journal-gatewayd.socket

2
units/systemd-journal-remote.service.in
View file

@ -34,7 +34,7 @@ LogsDirectory=journal/remote
# If there are many split up journal files we need a lot of fds to access them # If there are many split up journal files we need a lot of fds to access them
# all in parallel. # all in parallel.
LimitNOFILE=262144 LimitNOFILE=@HIGH_RLIMIT_NOFILE@
[Install] [Install]
Also=systemd-journal-remote.socket Also=systemd-journal-remote.socket

2
units/systemd-journal-upload.service.in
View file

@ -34,7 +34,7 @@ StateDirectory=systemd/journal-upload
# If there are many split up journal files we need a lot of fds to access them # If there are many split up journal files we need a lot of fds to access them
# all in parallel. # all in parallel.
LimitNOFILE=262144 LimitNOFILE=@HIGH_RLIMIT_NOFILE@
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

2
units/systemd-journald.service.in
View file

@ -37,4 +37,4 @@ IPAddressDeny=any
# If there are many split up journal files we need a lot of fds to access them # If there are many split up journal files we need a lot of fds to access them
# all in parallel. # all in parallel.
LimitNOFILE=262144 LimitNOFILE=@HIGH_RLIMIT_NOFILE@

2
units/systemd-logind.service.in
View file

@ -39,4 +39,4 @@ FileDescriptorStoreMax=512
# Increase the default a bit in order to allow many simultaneous logins since # Increase the default a bit in order to allow many simultaneous logins since
# we keep one fd open per session. # we keep one fd open per session.
LimitNOFILE=262144 LimitNOFILE=@HIGH_RLIMIT_NOFILE@