diff --git a/src/applications/conduit/management/PhabricatorConduitCallManagementWorkflow.php b/src/applications/conduit/management/PhabricatorConduitCallManagementWorkflow.php --- a/src/applications/conduit/management/PhabricatorConduitCallManagementWorkflow.php +++ b/src/applications/conduit/management/PhabricatorConduitCallManagementWorkflow.php @@ -21,6 +21,12 @@ 'File to read parameters from, or "-" to read from '. 'stdin.'), ), + array( + 'name' => 'local', + 'help' => pht( + 'Force the request to execute in this process, rather than '. + 'proxying to another host in the cluster.'), + ), array( 'name' => 'as', 'param' => 'username', @@ -75,9 +81,17 @@ $params = phutil_json_decode($input_json); - $result = id(new ConduitCall($method, $params)) - ->setUser($actor) - ->execute(); + $call = id(new ConduitCall($method, $params)) + ->setUser($actor); + + $api_request = $call->getAPIRequest(); + + $is_local = $args->getArg('local'); + if ($is_local) { + $api_request->setIsClusterRequest(true); + } + + $result = $call->execute(); $output = array( 'result' => $result,