diff options
| author | mehekj <mehek.jethani@gmail.com> | 2021-07-26 16:15:17 -0400 |
|---|---|---|
| committer | mehekj <mehek.jethani@gmail.com> | 2021-07-26 16:15:17 -0400 |
| commit | 11e95e35cde6e0c2390380975327f20eb5f3d1a4 (patch) | |
| tree | a3a466c751845117cc3ac50cd1b2868f7d057213 /src/server | |
| parent | 15041b8cd20bda206536b8d933672802c1a8cfc6 (diff) | |
| parent | 26e9e0a554ee5aff001e2bc10b6802a4e830b63c (diff) | |
Merge branch 'master' into temporalmedia-mehek
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/DashSession/Session/agents/server_worker.ts | 1 | ||||
| -rw-r--r-- | src/server/DashUploadUtils.ts | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/server/DashSession/Session/agents/server_worker.ts b/src/server/DashSession/Session/agents/server_worker.ts index 60fc181c7..84d35b40e 100644 --- a/src/server/DashSession/Session/agents/server_worker.ts +++ b/src/server/DashSession/Session/agents/server_worker.ts @@ -21,7 +21,6 @@ export class ServerWorker extends IPCMessageReceiver { private pollTarget: string; private serverPort: number; private isInitialized = false; - public static Create(work: Function) { if (isMaster) { console.error(red("cannot create a worker on the monitor process.")); diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts index 5ce69999a..a617571ae 100644 --- a/src/server/DashUploadUtils.ts +++ b/src/server/DashUploadUtils.ts @@ -1,4 +1,4 @@ -import { red, green } from 'colors'; +import { green, red } from 'colors'; import { ExifImage } from 'exif'; import { File } from 'formidable'; import { createWriteStream, existsSync, readFileSync, rename, unlinkSync, writeFile } from 'fs'; |
