Add isHeadlessBuild to EnvironmentInfo
Summary: Allows to attribute errors to flipper server or flipper electron Reviewed By: passy Differential Revision: D36698504 fbshipit-source-id: 6d07216fd05aa48b7c8cca5b53145916b64526eb
This commit is contained in:
committed by
Facebook GitHub Bot
parent
49eb026769
commit
4eca8d1088
@@ -51,7 +51,11 @@ async function getEmbeddedFlipperServer(
|
||||
const staticPath = getStaticDir();
|
||||
const isProduction = !/node_modules[\\/]electron[\\/]/.test(execPath);
|
||||
const env = process.env;
|
||||
const environmentInfo = await getEnvironmentInfo(staticPath, isProduction);
|
||||
const environmentInfo = await getEnvironmentInfo(
|
||||
staticPath,
|
||||
isProduction,
|
||||
false,
|
||||
);
|
||||
|
||||
let keytar: any = undefined;
|
||||
try {
|
||||
|
||||
@@ -104,6 +104,7 @@ export type Platform =
|
||||
export type EnvironmentInfo = {
|
||||
processId: number;
|
||||
isProduction: boolean;
|
||||
isHeadlessBuild: boolean;
|
||||
releaseChannel: ReleaseChannel;
|
||||
flipperReleaseRevision?: string;
|
||||
appVersion: string;
|
||||
|
||||
@@ -85,7 +85,7 @@ async function start(deviceQuery: string, appName: string, pluginId: string) {
|
||||
console.debug = () => {};
|
||||
console.info = console.error;
|
||||
|
||||
const environmentInfo = await getEnvironmentInfo(staticPath, false);
|
||||
const environmentInfo = await getEnvironmentInfo(staticPath, false, true);
|
||||
// TODO: initialise FB user manager to be able to do certificate exchange
|
||||
|
||||
const server = new FlipperServerImpl(
|
||||
|
||||
@@ -16,6 +16,7 @@ import {EnvironmentInfo, ReleaseChannel} from 'flipper-common';
|
||||
export async function getEnvironmentInfo(
|
||||
packageJsonDir: string,
|
||||
isProduction: boolean,
|
||||
isHeadlessBuild: boolean,
|
||||
): Promise<EnvironmentInfo> {
|
||||
const packageJson = await fs.readJSON(
|
||||
path.resolve(packageJsonDir, 'package.json'),
|
||||
@@ -41,6 +42,7 @@ export async function getEnvironmentInfo(
|
||||
return {
|
||||
processId: process.pid,
|
||||
isProduction,
|
||||
isHeadlessBuild,
|
||||
releaseChannel,
|
||||
flipperReleaseRevision,
|
||||
appVersion,
|
||||
|
||||
@@ -75,7 +75,7 @@ export async function startFlipperServer(
|
||||
console.error('Failed to load keytar:', e);
|
||||
}
|
||||
|
||||
const environmentInfo = await getEnvironmentInfo(appPath, isProduction);
|
||||
const environmentInfo = await getEnvironmentInfo(appPath, isProduction, true);
|
||||
|
||||
return new FlipperServerImpl(
|
||||
{
|
||||
|
||||
@@ -101,6 +101,7 @@ function createStubRenderHost(): RenderHost {
|
||||
processId: process.pid,
|
||||
appVersion: '0.0.0',
|
||||
isProduction: false,
|
||||
isHeadlessBuild: false,
|
||||
releaseChannel: ReleaseChannel.DEFAULT,
|
||||
flipperReleaseRevision: '000',
|
||||
os: {
|
||||
|
||||
Reference in New Issue
Block a user