Skip to content
This repository has been archived by the owner on Mar 3, 2022. It is now read-only.

Commit

Permalink
fix: updated core dependency & added fix for when shutting down / dis…
Browse files Browse the repository at this point in the history
…posing (causing error)
  • Loading branch information
nytamin committed Aug 14, 2018
1 parent 31168f6 commit 20ff505
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"production"
],
"dependencies": {
"tv-automation-server-core-integration": "0.4.1",
"tv-automation-server-core-integration": "0.5.0",
"mos-connection": "^0.4.0",
"tslib": "^1.6.0",
"underscore": "^1.8.3",
Expand Down
3 changes: 2 additions & 1 deletion src/connector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@ export class Connector {
// this._logger.error(e)
// this._logger.error(e.stack)

this._logger.info('Shutting down in 10 seconds!')

try {
this.dispose()
.catch(e => this._logger.error(e))
} catch (e) {
this._logger.error(e)
}

this._logger.info('Shutting down in 10 seconds!')
setTimeout(() => {
process.exit(0)
}, 10 * 1000)
Expand Down
1 change: 1 addition & 0 deletions src/mosHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ export class MosHandler {
return peripheralDevices.findOne(this._coreHandler.core.deviceId)
}
private _updateDevices (): Promise<void> {
if (this._disposed) return Promise.resolve()
return (
!this.mos ?
this._initMosConnection() :
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1166,9 +1166,9 @@ dashdash@^1.12.0:
dependencies:
assert-plus "^1.0.0"

"data-store@git+http://github.com/nytamin/data-store.git":
version "3.0.1"
resolved "git+http://github.com/nytamin/data-store.git#8d4779223a182666e0d80ba19d3a5b7b81fbce17"
data-store@3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/data-store/-/data-store-3.0.3.tgz#0adbbd40516678e2fd93a8875d9f3fd0e50cc717"

data-urls@^1.0.0:
version "1.0.0"
Expand Down Expand Up @@ -1196,9 +1196,9 @@ ddp-underscore-patched@0.8.1-2:
version "0.8.1-2"
resolved "https://registry.yarnpkg.com/ddp-underscore-patched/-/ddp-underscore-patched-0.8.1-2.tgz#65a414e9f22ec5a82aa16386e34366b48fcecf1d"

"ddp@git+http://github.com/nytamin/node-ddp-client.git#dev":
"ddp@git+http://github.com/nytamin/node-ddp-client.git#0.12.2-next1":
version "0.12.2"
resolved "git+http://github.com/nytamin/node-ddp-client.git#a79e92bf31608d03dad4702797f0d17c5c606ead"
resolved "git+http://github.com/nytamin/node-ddp-client.git#447fbf31fdcc26df75d9c7de4ef39852507d7e9e"
dependencies:
ddp-ejson "0.8.1-3"
ddp-underscore-patched "0.8.1-2"
Expand Down Expand Up @@ -4801,12 +4801,12 @@ tunnel-agent@~0.4.1:
version "0.4.3"
resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"

tv-automation-server-core-integration@0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/tv-automation-server-core-integration/-/tv-automation-server-core-integration-0.4.1.tgz#8a7561135ee8267ed225043a2e822fc3f2156fd5"
tv-automation-server-core-integration@0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/tv-automation-server-core-integration/-/tv-automation-server-core-integration-0.5.0.tgz#47b939c83c1e41f6513a563bede71d8c0002f6db"
dependencies:
data-store "git+http://github.com/nytamin/data-store.git"
ddp "git+http://github.com/nytamin/node-ddp-client.git#dev"
data-store "3.0.3"
ddp "git+http://github.com/nytamin/node-ddp-client.git#0.12.2-next1"
ddp-ejson "~0.8.1-3"
ddp-random "~0.8.1-1"
request "^2.87.0"
Expand Down

0 comments on commit 20ff505

Please sign in to comment.