diff --git a/libclient/utils/signal.go b/libclient/utils/signal.go
index fda419d0d6badafda37b7a4bd0b8453fb67bc565..788c22300bc089ed3776dfeeb5c715e6e1ac0cba 100644
--- a/libclient/utils/signal.go
+++ b/libclient/utils/signal.go
@@ -4,8 +4,6 @@ import (
"os"
"os/signal"
"syscall"
-
- u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils"
)
// Wait on most signals
@@ -14,8 +12,7 @@ func WaitForSignals() {
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGUSR1, syscall.SIGUSR2)
for {
- sig := <-sigs // blocks on any of the above signals.
- u.Println("Caught signal (" + sig.String() + ")")
+ <-sigs // blocks on any of the above signals.
break
}
}
diff --git a/nexus-exam/nexus-exam.go b/nexus-exam/nexus-exam.go
index 2fb493065142e26e1f2113e9265e9fe620b383be..5f7bcbacb8406f7b172040942044db520dc5158b 100644
--- a/nexus-exam/nexus-exam.go
+++ b/nexus-exam/nexus-exam.go
@@ -15,9 +15,10 @@ import (
"fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget"
nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient"
- u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils"
+ "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils"
"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/version"
"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexus-exam/buildversion"
+ u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils"
)
const (
@@ -171,7 +172,7 @@ func run() int {
// When one of these signals is received, the temporary certificate file is deleted.
// Without this "handler", the temporary certificate file wouldn't be deleted.
go func() {
- u.WaitForSignals()
+ utils.WaitForSignals()
exit(1)
}()
diff --git a/nexush/go.mod b/nexush/go.mod
index e792c35d9f55b68bd6fd4dba14bf5397a90de394..b6f247bf2b19f9d91462fa244447cf0a79321daf 100644
--- a/nexush/go.mod
+++ b/nexush/go.mod
@@ -4,6 +4,7 @@ go 1.22.2
require (
gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common v0.0.0-20250320135605-9ac7ec3df57a
+ gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient v0.0.0-20250326165914-127ec06fc619
github.com/go-pdf/fpdf v0.9.0
github.com/google/uuid v1.6.0
github.com/peterh/liner v1.2.2
diff --git a/nexush/go.sum b/nexush/go.sum
new file mode 100644
index 0000000000000000000000000000000000000000..bc77ffe01b57020b08c60f3a9a6a7d60988067b9
--- /dev/null
+++ b/nexush/go.sum
@@ -0,0 +1,47 @@
+gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common v0.0.0-20250320135605-9ac7ec3df57a h1:D4M2OnN+9vUALGPo6yNyWmcpvgGIzo/2HJj8SA4bGls=
+gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common v0.0.0-20250320135605-9ac7ec3df57a/go.mod h1:HzVsiYhPk7BhhvspjLchF3HlY1z+qIF89jG6+Hs8m3c=
+gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient v0.0.0-20250326165914-127ec06fc619 h1:ev2LeSLjB+/u0bfgMNcyOqySCGH5MDX0yxRow1qVPug=
+gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient v0.0.0-20250326165914-127ec06fc619/go.mod h1:FTufL1WbpOEXB509PnsxzFFrYBx2RRSidxAqdDYZgGM=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
+github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
+github.com/go-pdf/fpdf v0.9.0 h1:PPvSaUuo1iMi9KkaAn90NuKi+P4gwMedWPHhj8YlJQw=
+github.com/go-pdf/fpdf v0.9.0/go.mod h1:oO8N111TkmKb9D7VvWGLvLJlaZUQVPM+6V42pp3iV4Y=
+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
+github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
+github.com/go-playground/validator/v10 v10.25.0 h1:5Dh7cjvzR7BRZadnsVOzPhWsrwUr0nmsZJxEAnFLNO8=
+github.com/go-playground/validator/v10 v10.25.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus=
+github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM=
+github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
+github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/mattn/go-runewidth v0.0.3 h1:a+kO+98RDGEfo6asOGMmpodZq4FNtnGP54yps8BzLR4=
+github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/peterh/liner v1.2.2 h1:aJ4AOodmL+JxOZZEL2u9iJf8omNRpqHc/EbrK+3mAXw=
+github.com/peterh/liner v1.2.2/go.mod h1:xFwJyiKIXJZUKItq5dGHZSTBRAuG/CpeNpWLyiNRNwI=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
+golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/nexush/nexush.go b/nexush/nexush.go
index 96a20c9b2022ebe702a1c59edf5682464caf821d..48fde11ca2b64897b6dab0d1ebc89e97835e08b7 100644
--- a/nexush/nexush.go
+++ b/nexush/nexush.go
@@ -11,7 +11,7 @@ import (
"syscall"
nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient"
- u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils"
+ "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils"
"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/version"
"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/buildversion"
"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmd"
@@ -21,6 +21,7 @@ import (
"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdUser"
"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdVM"
"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdVersion"
+ u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils"
"github.com/peterh/liner"
"golang.org/x/term"
)
@@ -150,7 +151,7 @@ func run() int {
// When one of these signals is received, the temporary certificate file is deleted.
// Without this "handler", the temporary certificate file wouldn't be deleted.
go func() {
- u.WaitForSignals()
+ utils.WaitForSignals()
restoreTerm()
exit(1)
}()