External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-09 14:42:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary clear_opcache calls, as opcache is now disabled for cli

Browse Source 
Signed-off-by: Tobias Knöppler <6317548+theCalcaholic@users.noreply.github.com>
This commit is contained in:
Tobias Knöppler 2023-01-21 20:07:09 +01:00
parent 88ec3a8720
commit 362c8288f5
No known key found for this signature in database
GPG Key ID: 3510056072886A8F
6 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/ncp-restore
View File

@ -103,8 +103,6 @@ fi
cd "$NCDIR" cd "$NCDIR"
clear_opcache
### INCLUDEDATA=yes situation ### INCLUDEDATA=yes situation
NUMFILES=2 NUMFILES=2
if [[ $( ls "$TMPDIR" | wc -l ) -eq $NUMFILES ]]; then if [[ $( ls "$TMPDIR" | wc -l ) -eq $NUMFILES ]]; then
@ -183,6 +181,5 @@ ncc files:scan-app-data
# restart PHP if needed # restart PHP if needed
[[ "$NEED_RESTART" == "1" ]] && { [[ "$NEED_RESTART" == "1" ]] && {
clear_opcache bash -c "sleep 5; source /usr/local/etc/library.sh; clear_opcache; service php${PHPVER}-fpm restart" &>/dev/null &
bash -c "sleep 3; service php${PHPVER}-fpm restart" &>/dev/null &
} }

6
bin/ncp-update-nc
View File

@ -184,9 +184,6 @@ chown -R www-data:www-data nextcloud
find nextcloud/ -type d -exec chmod 750 {} \; find nextcloud/ -type d -exec chmod 750 {} \;
find nextcloud/ -type f -exec chmod 640 {} \; find nextcloud/ -type f -exec chmod 640 {} \;
# Clear PHP opcache
clear_opcache
# upgrade # upgrade
#################### ####################
echo "Upgrade..." echo "Upgrade..."
@ -250,7 +247,6 @@ then
apt-get install -y --no-install-recommends -t "$RELEASE" "${PHP_PACKAGES_OLD[@]}" apt-get install -y --no-install-recommends -t "$RELEASE" "${PHP_PACKAGES_OLD[@]}"
set_ncpcfg "php_version" "${PHPVER_OLD}" set_ncpcfg "php_version" "${PHPVER_OLD}"
install_template "php/opcache.ini.sh" "/etc/php/${PHPVER_NEW}/mods-available/opcache.ini" install_template "php/opcache.ini.sh" "/etc/php/${PHPVER_NEW}/mods-available/opcache.ini"
clear_opcache
run_app nc-limits run_app nc-limits
a2enconf "php${PHPVER_OLD}-fpm" a2enconf "php${PHPVER_OLD}-fpm"
service "php${PHPVER_OLD}-fpm" start service "php${PHPVER_OLD}-fpm" start
@ -308,3 +304,5 @@ mv "$BKP" "$DATADIR"/ncp-update-backups
chown -R www-data:www-data "$DATADIR"/ncp-update-backups chown -R www-data:www-data "$DATADIR"/ncp-update-backups
BKP="$DATADIR"/ncp-update-backups/"$( basename "$BKP" )" BKP="$DATADIR"/ncp-update-backups/"$( basename "$BKP" )"
echo "Backup stored at $BKP" echo "Backup stored at $BKP"
bash -c "sleep 5; source /usr/local/etc/library.sh; clear_opcache;" &>/dev/null &

3
bin/ncp/CONFIG/nc-limits.sh
View File

@ -80,8 +80,7 @@ configure()
# RESTART PHP # RESTART PHP
[[ "$require_fpm_restart" == "true" ]] && { [[ "$require_fpm_restart" == "true" ]] && {
clear_opcache bash -c "sleep 3; source /usr/local/etc/library.sh; clear_opcache; service php${PHPVER}-fpm restart" &>/dev/null &
bash -c "sleep 3; service php${PHPVER}-fpm restart" &>/dev/null &
} }
# redis max memory # redis max memory

3
bin/ncp/TOOLS/clear-php-opcache.sh
View File

@ -12,7 +12,8 @@
configure() configure()
{ {
echo "Clearing opcache..." echo "Clearing opcache..."
clear_opcache bash -c "sleep 5; source /usr/local/etc/library.sh; clear_opcache;" &>/dev/null &
echo "Done."
} }
install() { :; } install() { :; }

5
updates/1.50.0.sh
View File

@ -2,8 +2,5 @@
set -e set -e
export NCPCFG=/usr/local/etc/ncp.cfg export NCPCFG=/usr/local/etc/ncp.cfg
source /usr/local/etc/library.sh
bash -c "sleep 6; source /usr/local/etc/library.sh; clear_opcache" &>/dev/null &
clear_opcache
bash -c "sleep 6; service php${PHPVER}-fpm restart" &>/dev/null &

3
updates/1.50.1.sh
View File

@ -6,5 +6,4 @@ source /usr/local/etc/library.sh
install_template systemd/notify_push.service.sh /etc/systemd/system/notify_push.service install_template systemd/notify_push.service.sh /etc/systemd/system/notify_push.service
clear_opcache bash -c "sleep 6; source /usr/local/etc/library.sh; clear_opcache; service php${PHPVER}-fpm reload" &>/dev/null &
bash -c "sleep 6; service php${PHPVER}-fpm restart" &>/dev/null &