@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
When cluster.instance is defined, use it to namespace S3 objects
Summary: Ref T7163. This isn't //technically// necessary but seems generally desirable.
Test Plan: Will deploy S3 in production.
Reviewers: btrahan
Reviewed By: btrahan
Subscribers: epriestley
Maniphest Tasks: T7163
Differential Revision: https://secure.phabricator.com/D11770
+13
-6
+13
-6
src/applications/files/engine/PhabricatorS3FileStorageEngine.php
+13
-6
src/applications/files/engine/PhabricatorS3FileStorageEngine.php
···
32
32
// files more browsable with web/debugging tools like the S3 administration
33
33
// tool.
34
34
$seed = Filesystem::readRandomCharacters(20);
35
-
$parts = array(
36
-
substr($seed, 0, 2),
37
-
substr($seed, 2, 2),
38
-
substr($seed, 4),
39
-
);
40
-
$name = 'phabricator/'.implode('/', $parts);
35
+
$parts = array();
36
+
$parts[] = 'phabricator';
37
+
38
+
$instance_name = PhabricatorEnv::getEnvConfig('cluster.instance');
39
+
if (strlen($instance_name)) {
40
+
$parts[] = $instance_name;
41
+
}
42
+
43
+
$parts[] = substr($seed, 0, 2);
44
+
$parts[] = substr($seed, 2, 2);
45
+
$parts[] = substr($seed, 4);
46
+
47
+
$name = implode('/', $parts);
41
48
42
49
AphrontWriteGuard::willWrite();
43
50
$profiler = PhutilServiceProfiler::getInstance();