Skip to content

Commit

Permalink
specialize to avoid missing pgid error on windows (#272)
Browse files Browse the repository at this point in the history
Signed-off-by: Denis Vaumoron <dvaumoron@gmail.com>
  • Loading branch information
dvaumoron authored Oct 25, 2024
1 parent 51b7caa commit 004dd21
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 18 deletions.
45 changes: 45 additions & 0 deletions versionmanager/proxy/detached_others.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
//go:build !windows

/*
*
* Copyright 2024 tofuutils authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

package proxy

import (
"fmt"
"os/exec"
"syscall"

configutils "github.com/tofuutils/tenv/v3/config/utils"
)

func initDetachedBehaviorFromEnv(cmd *exec.Cmd) {
detached, err := configutils.GetenvBool(false, "TENV_DETACHED_PROXY")
if err != nil {
fmt.Println("Failed to read TENV_DETACHED_PROXY environment variable, disable behavior :", err) //nolint
}
if !detached {
return
}

if cmd.SysProcAttr == nil {
cmd.SysProcAttr = &syscall.SysProcAttr{}
}

cmd.SysProcAttr.Setpgid = true
}
35 changes: 35 additions & 0 deletions versionmanager/proxy/detached_windows.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
*
* Copyright 2024 tofuutils authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

package proxy

import (
"fmt"
"os/exec"

configutils "github.com/tofuutils/tenv/v3/config/utils"
)

func initDetachedBehaviorFromEnv(_ *exec.Cmd) {
switch detached, err := configutils.GetenvBool(false, "TENV_DETACHED_PROXY"); {
case err != nil:
fmt.Println("TENV_DETACHED_PROXY behavior is always disabled on Windows OS, failed to read environment variable :", err) //nolint
case detached:
fmt.Println("TENV_DETACHED_PROXY behavior is always disabled on Windows OS, can not apply environment variable") //nolint
}
}
18 changes: 0 additions & 18 deletions versionmanager/proxy/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@ import (
"os/exec"
"path/filepath"
"strings"
"syscall"

"github.com/hashicorp/hcl/v2/hclparse"

"github.com/tofuutils/tenv/v3/config"
configutils "github.com/tofuutils/tenv/v3/config/utils"
cmdproxy "github.com/tofuutils/tenv/v3/pkg/cmdproxy"
"github.com/tofuutils/tenv/v3/pkg/loghelper"
"github.com/tofuutils/tenv/v3/versionmanager/builder"
Expand Down Expand Up @@ -86,19 +84,3 @@ func updateWorkPath(conf *config.Config, cmdArgs []string) {
}
}
}

func initDetachedBehaviorFromEnv(cmd *exec.Cmd) {
detached, err := configutils.GetenvBool(false, "TENV_DETACHED_PROXY")
if err != nil {
fmt.Println("Failed to read TENV_DETACHED_PROXY environment variable, disable behavior :", err) //nolint
}
if !detached {
return
}

if cmd.SysProcAttr == nil {
cmd.SysProcAttr = &syscall.SysProcAttr{}
}

cmd.SysProcAttr.Setpgid = true
}

0 comments on commit 004dd21

Please sign in to comment.