Commit Graph

66 Commits

Author SHA1 Message Date
Damjan Georgievski cc8b508987
introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)
nextcloud by default uses the `/config/` directory in the source/application tree for its config file(s).
with this commit that directory can be overridden by the `NEXTCLOUD_CONFIG_DIR` environment variable.

in uwsgi, you would use the option `--env "NEXTCLOUD_CONFIG_DIR=/tmp/nx-config/"`
in apache `SetENV …`
and the cli command can be run with: `NEXTCLOUD_CONFIG_DIR=/tmp/nx-config ./occ` (or just use `export` once in the
shell).

NEXTCLOUD_CONFIG_DIR can be supplied with or without the trailing slash (`/`), but in all cases `$configDir` will have
it automatically added if needed.

The other changes are several occurrences of `OC::$SERVERROOT . '/config'` to `OC::$configDir`.
2016-08-26 12:31:43 +02:00
Jörn Friedrich Dreyer 9b760aafa1
log class name, ID only is hard to debug 2016-08-09 16:19:06 +02:00
Joas Schilling 23b205ed48
Run the license script 2016-07-22 11:40:41 +02:00
Morris Jobke c2d88a08b7
Remove unneeded checks if it runs on a Windows machine
* the setup check is still there
2016-07-08 15:55:17 +02:00
Lukas Reschke aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Joas Schilling 92c21fd6f4
Do not lock the cron anymore so we can have multiple workers 2016-05-21 01:59:25 +02:00
Joas Schilling d0a2fa0506
Lock jobs while executing them, to allow multiple executors to run in parallel 2016-05-21 01:59:25 +02:00
Joas Schilling e252967e83
Make sure that CLI cron doesn't run for ever, but makes use of the next spawn 2016-04-21 10:33:44 +02:00
Thomas Müller 6a6fc742dc Catch class Error on all root entrypoints 2016-04-20 18:01:47 +02:00
Joas Schilling 5238fc3f54 Do not create a loop that generates thousands of jobs 2016-01-28 15:40:23 +01:00
Thomas Müller 682821c71e Happy new year! 2016-01-12 15:02:18 +01:00
Morris Jobke 95a3b4fd24 Add debug log statement for IJobList steps in cron.php
* makes debugging easier
2015-11-06 11:08:30 +01:00
Morris Jobke f46d531a4f Replace some OC_Config calls with ILogger methods 2015-10-30 09:51:16 +01:00
Morris Jobke b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Phil Davis a165710e99 Minor text typos
that I noticed while looking at some code.
2015-09-21 23:04:25 +05:45
Joas Schilling 36eef2ddab Add a session wrapper to encrypt the data before storing it on disk 2015-08-21 17:59:23 +02:00
Thomas Müller d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00
Morris Jobke 60b8aa2a83 Removed OC_BackgroundJob - reduce class overhead
* method code is now in the static public namespace (5 sloc)
2015-04-18 23:37:32 +02:00
Robin Appelman d96e9d174b block cron when in single user mode 2015-04-09 13:50:53 +02:00
Thomas Müller 5ebd3a9e89 Cron has to be executed with the correct user - fixes 13912 and others 2015-04-01 10:31:48 +02:00
Jenkins for ownCloud b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Thomas Müller e3fd13de88 cron shall not operate in case we are in maintenance mode - fixes #14843 2015-03-12 21:03:26 +01:00
Thomas Müller b4cf6e62bf cron.php on cli has no time limitation - fixes #14481 2015-03-11 01:09:12 +01:00
Morris Jobke 06aef4e8b1 Revert "Updating license headers"
This reverts commit 6a1a4880f0.
2015-02-26 11:37:37 +01:00
Bernhard Posselt 5b506ab518 use flock instead of just checking if there is a file to prevent deadlocks when the process crashed or the unlink wasnt done
move cron.lock into top directory to prevent external storage issues

use tmp directory lock file

use new config interface

incorporate #13770

add dots
2015-02-24 15:41:20 +01:00
Jenkins for ownCloud 6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Robin Appelman 0b96297783 Use the TempManager to handle temporary files 2014-10-24 12:18:49 +02:00
Thomas Müller d9907b6fa3 move some deprecated usage of OC_Config and OC_AppConfig to \OC::server 2014-10-20 14:44:44 +02:00
Morris Jobke b7445582dc add proper End of Line character 2014-08-31 14:21:46 +02:00
Jörn Friedrich Dreyer f551917a3c kill OC::$session
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession

restore order os OC::$session and OC::$CLI

remove unneded initialization of dummy session

write back session when $useCustomSession is true

log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
Oliver Kohl D.Sc. 2ff369e7f3 Update cron.php 2014-07-24 13:54:55 +02:00
Oliver Kohl D.Sc. 97e61f438f CRON call ends in null exception
[error] 4461#0: *186285 FastCGI sent in stderr: "PHP message
: PHP Fatal error:  Call to a member function execute() on null in /var/www/ownc
loud/cron.php on line 125" while reading response header from upstream, client:
217.13.183.252, server: cloud.mycloud.com, request: "GET /cron.php HTTP/1.1", upstre
am: "fastcgi://unix:/var/run/php5-fpm.sock:", host: "cloud.mycloud.com", referrer: "
https://cloud.mycloud.com/"
2014-07-24 13:46:40 +02:00
Vincent Petry 547927bdd2 Prevent cron.php to trigger apps updating 2014-07-23 21:29:24 +02:00
Steffen Lindner 22394fa4f5 Fix indent 2014-07-02 12:00:35 +02:00
Steffen Lindner 9433b94fd5 initialize a dummy memory session - fixes https://github.com/owncloud/activity/issues/78 2014-07-02 11:52:45 +02:00
Thomas Müller 5fa8f7cf12 Merge pull request #7107 from owncloud/load-apps-proper-master
Load apps proper master
2014-03-28 10:33:55 +01:00
kondou dda7129a24 Merge branch 'master' of https://github.com/owncloud/core into last_cron_log 2014-03-21 20:23:31 +01:00
Thomas Müller 6ff96b34ad Merge branch 'master' into load-apps-proper-master
Conflicts:
	apps/files/ajax/rawlist.php
	cron.php
	ocs/v1.php
2014-03-21 14:05:08 +01:00
kondou 547b563464 Log last cron execution
Fixes #2012
2014-03-12 15:20:51 +01:00
Thomas Müller 58c216d0e8 close the session on all file operations 2014-03-10 14:39:27 +01:00
Thomas Müller e139f7c863 load all apps to get all cron jobs executed 2014-02-18 17:17:08 +01:00
Robin Appelman a6399f9cef Add the background job list to the public server container 2014-02-11 14:00:24 +01:00
Robin Appelman 35bb6f7e3a Catch exceptions from background jobs and log them 2013-12-02 13:41:47 +01:00
Boris Rybalkin 00c998c5bb fixing typo
Typo in comment "feature" => "future"
2013-09-23 21:08:58 -04:00
kondou 9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Jörn Friedrich Dreyer 8dc6bdd96b clean up usage of DatabaseSetupException and catch Exceptions in entrypoints 2013-06-10 13:45:19 +02:00
Robin Appelman 251527c6e6 merge master into backgroundjob 2013-06-02 20:12:44 +02:00
Michael Gapczynski 9b622bdeed RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead 2013-05-22 15:02:11 -04:00
Robin Appelman 7948341a86 Rework background job system 2013-04-20 23:27:46 +02:00
Robin Appelman d0a5fe1f4a code style 2013-04-20 21:26:47 +02:00