Adds some settings to check flipper-server state

Summary:
There's one setting: to enable or disable flipper-server.

However, I've added some current running state to it. If there's a better way of doing this, please do let me know.

Reviewed By: aigoncharov

Differential Revision: D37276670

fbshipit-source-id: f6c941cf0cfe55c267b9bcb9f799934fba1e28ef
This commit is contained in:
Lorenzo Blasa
2022-06-22 05:26:11 -07:00
committed by Facebook GitHub Bot
parent 8c67b049ab
commit 335dec1a08
7 changed files with 83 additions and 3 deletions

View File

@@ -87,7 +87,11 @@ async function getFlipperServer(
);
const keytar: KeytarModule = await getKeytarModule(staticPath);
const gatekeepers = getGatekeepers(environmentInfo.os.unixname);
if (gatekeepers['flipper_desktop_use_server']) {
const serverUsageEnabled = gatekeepers['flipper_desktop_use_server'];
const settings = await loadSettings();
if (serverUsageEnabled && (!settings.server || settings.server.enabled)) {
const socketPath = await makeSocketPath();
if (!(await checkSocketInUse(socketPath))) {
console.info('flipper-server: not running/listening, start');
@@ -104,6 +108,7 @@ async function getFlipperServer(
'',
false,
keytar,
'embedded',
);
const companionEnv = await initCompanionEnv(server);
@@ -113,6 +118,7 @@ async function getFlipperServer(
} else {
console.info('flipper-server: already running');
const loggerOutputFile = 'flipper-server-log.out';
tailServerLogs(path.join(staticPath, loggerOutputFile));
}
@@ -139,7 +145,7 @@ async function getFlipperServer(
},
launcherSettings: await loadLauncherSettings(),
processConfig: loadProcessConfig(env),
settings: await loadSettings(),
settings,
validWebSocketOrigins:
constants.VALID_WEB_SOCKET_REQUEST_ORIGIN_PREFIXES,
},