From e99048888927adc86c0239e691c369ad69a6b451 Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Thu, 24 Jan 2013 12:05:29 -0800 Subject: [PATCH] Set some defaults back to correctness. Summary: There were a few defaults that got changed when porting to PHP. Most of them seem to be accidental, so this diff sets them back to correctness. Test Plan: php> require '../libphutil/src/__phutil_library_init__.php'; php> require 'src/__phutil_library_init__.php' php> $a = PhabricatorApplicationConfigOptions::loadAllOptions() php> $b = require 'conf/default.conf.php'; php> $x = array(); php> foreach($a as $key => $obj) { $x[$key] = $obj->getDefault(); } php> foreach($x as $key => $default) { if ($b[$key] != $default) { echo "$key has different default.\n"; } } log.access.format has different default. (seems to be intentional) PHP Notice: Undefined index: phabricator.env in /usr/lib/python2.7/site-packages/phpsh/phpsh.php(577) : eval()'d code on line 1 (no longer in config file) PHP Notice: Undefined index: test.value in /usr/lib/python2.7/site-packages/phpsh/phpsh.php(577) : eval()'d code on line 1 (not in config file) metamta.default-address has different default. (intentional) metamta.domain has different default. (intentional) PHP Notice: Undefined index: phid.external-loaders in /usr/lib/python2.7/site-packages/phpsh/phpsh.php(577) : eval()'d code on line 1 (no longer in config file) phame.skins has different default. (fixed in D4618) Reviewers: epriestley, btrahan Reviewed By: epriestley CC: aran, Korvin Maniphest Tasks: T2255 Differential Revision: https://secure.phabricator.com/D4621 --- .../option/PhabricatorGarbageCollectorConfigOptions.php | 2 +- .../config/option/PhabricatorNotificationConfigOptions.php | 4 ++-- .../config/PhabricatorDifferentialConfigOptions.php | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/applications/config/option/PhabricatorGarbageCollectorConfigOptions.php b/src/applications/config/option/PhabricatorGarbageCollectorConfigOptions.php index 75a6ae4dc5..2bacb46857 100644 --- a/src/applications/config/option/PhabricatorGarbageCollectorConfigOptions.php +++ b/src/applications/config/option/PhabricatorGarbageCollectorConfigOptions.php @@ -18,7 +18,7 @@ final class PhabricatorGarbageCollectorConfigOptions 30, pht('Number of seconds to retain Herald transcripts for.')), 'gcdaemon.ttl.daemon-logs' => array( - 14, + 7, pht('Number of seconds to retain Daemon logs for.')), 'gcdaemon.ttl.differential-parse-cache' => array( 14, diff --git a/src/applications/config/option/PhabricatorNotificationConfigOptions.php b/src/applications/config/option/PhabricatorNotificationConfigOptions.php index 80e974a4cc..bb8f2c70b5 100644 --- a/src/applications/config/option/PhabricatorNotificationConfigOptions.php +++ b/src/applications/config/option/PhabricatorNotificationConfigOptions.php @@ -29,12 +29,12 @@ final class PhabricatorNotificationConfigOptions $this->newOption( 'notification.client-uri', 'string', - 'http://localhost:22280') + 'http://localhost:22280/') ->setDescription(pht('Location of the client server.')), $this->newOption( 'notification.server-uri', 'string', - 'http://localhost:22281') + 'http://localhost:22281/') ->setDescription(pht('Location of the notification receiver server.')), $this->newOption('notification.user', 'string', null) ->setSummary(pht('Drop permissions to a less-privileged user.')) diff --git a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php index a483a20f75..9f077e1c85 100644 --- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php +++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php @@ -41,7 +41,10 @@ final class PhabricatorDifferentialConfigOptions $this->newOption( 'differential.whitespace-matters', 'list', - array()) + array( + '/\.py$/', + '/\.l?hs$/', + )) ->setDescription( pht( "List of file regexps where whitespace is meaningful and should ".