Skip to content

Commit

Permalink
fix kill command with SIGTERM; tag 0.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
tiye committed May 11, 2023
1 parent b561b21 commit f4d4aaf
Show file tree
Hide file tree
Showing 5 changed files with 211 additions and 235 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ jobs:

- uses: supplypike/setup-bin@v3
with:
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.6.24/cr'
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.6.27/cr'
name: 'cr'
version: '0.6.24'
version: '0.6.27'

- uses: supplypike/setup-bin@v3
with:
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.6.24/caps'
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.6.27/caps'
name: 'caps'
version: '0.6.24'
version: '0.6.27'

- run: caps --ci && yarn && yarn compile-server && yarn compile-page && yarn release-page

Expand Down
47 changes: 31 additions & 16 deletions calcit.cirru

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions compact.cirru
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

{} (:package |app)
:configs $ {} (:init-fn |app.server/main!) (:reload-fn |app.server/reload!) (:version |0.1.7-a4)
:configs $ {} (:init-fn |app.server/main!) (:reload-fn |app.server/reload!) (:version |0.1.8)
:modules $ [] |lilac/ |recollect/ |memof/ |ws-edn.calcit/ |cumulo-util.calcit/ |cumulo-reel.calcit/ |fuzzy-filter/
:entries $ {}
:page $ {} (:init-fn |app.client/main!) (:reload-fn |app.client/reload!)
Expand Down Expand Up @@ -1011,23 +1011,23 @@
{} (:pid pid) (:command command) (:cwd cwd)
:title $ :title op-data
, sid
.on proc "\"exit" $ fn (event _) (dispatch! :process/finish pid sid) (swap! *registry dissoc pid)
.on proc "\"error" $ fn (event) (js/console.error event)
.!on proc "\"exit" $ fn (event _) (; js/console.debug "\"[process killed]" event) (dispatch! :process/finish pid sid) (swap! *registry dissoc pid)
.!on proc "\"error" $ fn (event) (js/console.error event)
dispatch! :process/error
[] pid $ str event
, sid
dispatch! :process/finish pid sid
.on (.-stdout proc) |data $ fn (data)
.!on (.-stdout proc) |data $ fn (data)
dispatch! :process/stdout ([] pid data) sid
.on (.-stderr proc) |data $ fn (data)
.!on (.-stderr proc) |data $ fn (data)
dispatch! :process/stderr ([] pid data) sid
|kill-process! $ quote
defn kill-process! (pid dispatch! sid)
let
proc $ get @*registry pid
if (some? proc)
do $ .kill proc "\"SIGINT"
dispatch! :process/finish pid sid
do $ .!kill proc "\"SIGTERM"
do (eprintln "\"[warn] process not found in registry:" pid @*registry) (dispatch! :process/finish pid sid)
:ns $ quote
ns app.manager $ :require ([] |child_process :as cp)
|app.schema $ {}
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "termina",
"version": "0.1.7-a4",
"version": "0.1.8",
"description": "Start process from a Webpage",
"bin": {
"termina": "./server.mjs"
Expand All @@ -19,7 +19,7 @@
"author": "jiyinyiyong",
"license": "MIT",
"dependencies": {
"@calcit/procs": "^0.6.26",
"@calcit/procs": "^0.6.27",
"chalk": "^5.2.0",
"dayjs": "^1.11.7",
"latest-version": "^7.0.0",
Expand All @@ -33,6 +33,6 @@
"devDependencies": {
"bottom-tip": "^0.1.5",
"feather-icons": "^4.29.0",
"vite": "^4.2.1"
"vite": "^4.3.5"
}
}
Loading

0 comments on commit f4d4aaf

Please sign in to comment.