View Options

	diff --git a/src/applications/repository/controller/PhabricatorRepositoryController.php b/src/applications/repository/controller/PhabricatorRepositoryController.php
	index dcb62685f9..f8c82f9188 100644
	--- a/src/applications/repository/controller/PhabricatorRepositoryController.php
	+++ b/src/applications/repository/controller/PhabricatorRepositoryController.php
	@@ -1,89 +1,92 @@
	<?php

	/*
	* Copyright 2012 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	abstract class PhabricatorRepositoryController extends PhabricatorController {

	public function shouldRequireAdmin() {
	// Most of these controllers are admin-only.
	return true;
	}

	public function buildStandardPageResponse($view, array $data) {
	$page = $this->buildStandardPageView();

	$page->setApplicationName('Repositories');
	$page->setBaseURI('/repository/');
	$page->setTitle(idx($data, 'title'));
	$page->setGlyph("rX");
	$page->appendChild($view);


	$response = new AphrontWebpageResponse();
	return $response->setContent($page->render());
	}

	- private function isPullDaemonRunningOnThisMachine() {
	-
	- // This is sort of hacky, but should probably work.
	-
	- list($stdout) = execx('ps auxwww');
	- return preg_match('/PhabricatorRepositoryPullLocalDaemon/', $stdout);
	+ private function isPullDaemonRunning() {
	+ $control = new PhabricatorDaemonControl();
	+ $daemons = $control->loadRunningDaemons();
	+ foreach ($daemons as $daemon) {
	+ if ($daemon->isRunning() &&
	+ $daemon->getName() == 'PhabricatorRepositoryPullLocalDaemon')
	+ return true;
	+ }
	+ return false;
	}

	protected function renderDaemonNotice() {
	$documentation = phutil_render_tag(
	'a',
	array(
	'href' => PhabricatorEnv::getDoclink(
	'article/Diffusion_User_Guide.html'),
	),
	'Diffusion User Guide');

	$common =
	"Without this daemon, Phabricator will not be able to import or update ".
	"repositories. For instructions on starting the daemon, see ".
	"<strong>{$documentation}</strong>.";

	try {
	- $daemon_running = $this->isPullDaemonRunningOnThisMachine();
	+ $daemon_running = $this->isPullDaemonRunning();
	if ($daemon_running) {
	return null;
	}
	$title = "Repository Daemon Not Running";
	$message =
	"<p>The repository daemon is not running on this machine. ".
	"{$common}</p>";
	} catch (CommandException $ex) {
	$title = "Unable To Verify Repository Daemon";
	$message =
	"<p>Unable to determine if the repository daemon is running on this ".
	"machine. {$common}</p>".
	"<p><strong>Exception:</strong> ".
	phutil_escape_html($ex->getMessage()).
	"</p>";
	}

	$view = new AphrontErrorView();
	$view->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$view->setTitle($title);
	$view->appendChild($message);

	return $view;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Jun 10, 5:15 PM (1 d, 12 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 140592
Default Alt Text: (3 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions