Merge pull request symbiote#14 from ajshort/master

Custom Job Config

code/services/AbstractQueuedJob.php

@@ -73,22 +73,20 @@ public function getJobType() {
 	}
 
 	/**
-	 * Implement yourself!
+	 * Performs setup tasks the first time this job is run.
 	 *
-	 * Be aware that this is only executed ONCE for every job
-	 *
-	 * If you want to do some checking on every restart, look into using the prepareForRestart method
+	 * This is only executed once for every job. If you want to run something on every job restart, use the
+	 * {@link prepareForRestart} method.
 	 */
 	public function setup() {
-
+		$this->loadCustomConfig();
 	}
 
 	/**
-	 * This is called when you want to perform some form of initialisation on a restart of a
-	 * job. 
+	 * Run when an already setup job is being restarted.
 	 */
 	public function prepareForRestart() {
-
+		$this->loadCustomConfig();
 	}
 
 	/**
@@ -139,6 +137,39 @@ public function setJobData($totalSteps, $currentStep, $isComplete, $jobData, $me
 
 	}
 
+	/**
+	 * Gets custom config settings to use when running the job.
+	 *
+	 * @return array|null
+	 */
+	public function getCustomConfig() {
+		return $this->CustomConfig;
+	}
+
+	/**
+	 * Sets custom config settings to use when the job is run.
+	 *
+	 * @param array $config
+	 */
+	public function setCustomConfig(array $config) {
+		$this->CustomConfig = $config;
+	}
+
+	/**
+	 * Sets custom configuration settings from the job data.
+	 */
+	private function loadCustomConfig() {
+		$custom = $this->getCustomConfig();
+
+		if (!is_array($custom)) {
+			return;
+		}
+
+		foreach ($custom as $class => $settings) {
+			foreach ($settings as $setting => $value) Config::inst()->update($class, $setting, $value);
+		}
+	}
+
 	public function addMessage($message, $severity='INFO') {
 		$severity = strtoupper($severity);
 		$this->messages[] = '[' . date('Y-m-d H:i:s') . "][$severity] $message";

code/services/QueuedJobService.php

@@ -378,6 +378,9 @@ public function runJob($jobId) {
 
 		$broken = false;
 
+		// Push a config context onto the stack for the duration of this job run.
+		Config::nest();
+
 		try {
 			$job = $this->initialiseJob($jobDescriptor);
 
@@ -395,8 +398,6 @@ public function runJob($jobId) {
 			// have we stalled at all?
 			$stallCount = 0;
 
-			$currentBaseUrl = Director::absoluteBaseURL();
-
 			if ($job->SubsiteID && class_exists('Subsite')) {
 				Subsite::changeSubsite($job->SubsiteID);
 
@@ -405,7 +406,8 @@ public function runJob($jobId) {
 				if ($subsite && $subsite->exists()) {
 					$domain = $subsite->domain();
 					$base = rtrim(Director::protocol() . $domain, '/') . '/';
-					Director::setbaseURL($base);
+
+					Config::inst()->update('Director', 'alternate_base_url', $base);
 				}
 			}
 
@@ -475,8 +477,7 @@ public function runJob($jobId) {
 					$broken = true;
 				}
 			}
-
-			Director::setBaseURL($currentBaseUrl);
+
 			// a last final save. The job is complete by now
 			if ($jobDescriptor) {
 				$jobDescriptor->write();
@@ -496,6 +497,8 @@ public function runJob($jobId) {
 
 		$errorHandler->clear();
 
+		Config::unnest();
+
 		// okay lets reset our user if we've got an original
 		if ($runAsUser && $originalUser) {
 			Session::clear("loggedInAs");