diff options
| author | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-05-16 15:10:54 -0500 |
|---|---|---|
| committer | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-05-16 15:10:54 -0500 |
| commit | d7a21aa87bd214c33c511729ce6f98f1d70f0385 (patch) | |
| tree | 0fc0ca4b39f1bd6f0caf9041ac85ae7fea717ded /src/server/index.ts | |
| parent | c8a344c86535e14be09230a083b894c821453bc0 (diff) | |
| parent | 9c3d461a9642a4596c55f642af2b55e186b0fe20 (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into script_documents
Diffstat (limited to 'src/server/index.ts')
| -rw-r--r-- | src/server/index.ts | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/server/index.ts b/src/server/index.ts index d1bac6635..fd5552d12 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -149,9 +149,18 @@ export async function launchServer() { * log the output of the server process, so it's not ideal for development. * So, the 'else' clause is exactly what we've always run when executing npm start. */ +<<<<<<< HEAD if (process.env.RELEASE) { (sessionAgent = new DashSessionAgent()).launch(); } else { setTimeout(() => (Database.Instance as Database.Database).doConnect(), 30000); launchServer(); } +======= +// if (process.env.RELEASE) { +// (sessionAgent = new DashSessionAgent()).launch(); +// } else { +(Database.Instance as Database.Database).doConnect(); +launchServer(); +// } +>>>>>>> 9c3d461a9642a4596c55f642af2b55e186b0fe20 |