Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/app/block/block.scss
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
backdrop-filter: blur(50px);
border-radius: 6px;
box-shadow: 0px 13px 16px 0px rgb(from var(--block-bg-color) r g b / 40%);
opacity: 0.85;
opacity: 0.9;

.connstatus-content {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion frontend/app/block/connstatusoverlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const StalledOverlay = React.memo(

return (
<div
className="@container absolute top-[calc(var(--header-height)+6px)] left-1.5 right-1.5 z-[var(--zindex-block-mask-inner)] overflow-hidden rounded-md bg-[var(--conn-status-overlay-bg-color)] backdrop-blur-[50px] shadow-lg opacity-85"
className="@container absolute top-[calc(var(--header-height)+6px)] left-1.5 right-1.5 z-[var(--zindex-block-mask-inner)] overflow-hidden rounded-md bg-[var(--conn-status-overlay-bg-color)] backdrop-blur-[50px] shadow-lg opacity-90"
ref={overlayRefCallback}
>
<div className="flex items-center gap-3 w-full pt-2.5 pb-2.5 pr-2 pl-3">
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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

1 change: 1 addition & 0 deletions pkg/jobcontroller/jobcontroller.go
Original file line number Diff line number Diff line change
Expand Up @@ -1155,6 +1155,7 @@ func doReconnectJob(ctx context.Context, jobId string, rtOpts *waveobj.RuntimeOp
return fmt.Errorf("route did not establish after successful reconnection: %w", err)
}
SetJobConnStatus(jobId, JobConnStatus_Connected)
sendBlockJobStatusEventByJob(ctx, job)

telemetry.GoRecordTEventWrap(&telemetrydata.TEvent{
Event: "job:reconnect",
Expand Down
10 changes: 6 additions & 4 deletions pkg/shellexec/conninterface.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,13 @@ func (cw CmdWrap) KillGraceful(timeout time.Duration) {
return
}
if runtime.GOOS == "windows" {
cw.Cmd.Process.Signal(os.Interrupt)
} else if cw.IsShell {
syscall.Kill(cw.Cmd.Process.Pid, syscall.SIGHUP)
cw.Cmd.Process.Kill()
return
}
if cw.IsShell {
unixutil.SignalHup(cw.Cmd.Process.Pid)
} else {
cw.Cmd.Process.Signal(syscall.SIGTERM)
unixutil.SignalTerm(cw.Cmd.Process.Pid)
}
go func() {
defer func() {
Expand Down
8 changes: 8 additions & 0 deletions pkg/util/unixutil/unixutil_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,11 @@ func GetSignalName(sig os.Signal) string {
func SetCloseOnExec(fd int) {
unix.CloseOnExec(fd)
}

func SignalTerm(pid int) error {
return syscall.Kill(pid, syscall.SIGTERM)
}

func SignalHup(pid int) error {
return syscall.Kill(pid, syscall.SIGHUP)
}
13 changes: 13 additions & 0 deletions pkg/util/unixutil/unixutil_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,16 @@ func GetSignalName(sig os.Signal) string {

func SetCloseOnExec(fd int) {
}

func SignalTerm(pid int) error {
proc, err := os.FindProcess(pid)
if err != nil {
return err
}
return proc.Kill()
}

// this is a no-op on windows
func SignalHup(pid int) error {
return nil
}
Loading