mirror of https://github.com/jetkvm/kvm.git
Merge branch 'dev' into chore/network-enhancement
This commit is contained in:
commit
886b58d105
|
@ -26,12 +26,12 @@ jobs:
|
||||||
- name: Install Go
|
- name: Install Go
|
||||||
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
|
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
|
||||||
with:
|
with:
|
||||||
go-version: 1.23.x
|
go-version: 1.24.x
|
||||||
- name: Create empty resource directory
|
- name: Create empty resource directory
|
||||||
run: |
|
run: |
|
||||||
mkdir -p static && touch static/.gitkeep
|
mkdir -p static && touch static/.gitkeep
|
||||||
- name: Lint
|
- name: Lint
|
||||||
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
|
uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
|
||||||
with:
|
with:
|
||||||
args: --verbose
|
args: --verbose
|
||||||
version: v1.62.0
|
version: v2.0.2
|
||||||
|
|
2
fuse.go
2
fuse.go
|
@ -37,7 +37,7 @@ func (f *WebRTCStreamFile) Getattr(ctx context.Context, fh fs.FileHandle, out *f
|
||||||
f.mu.Lock()
|
f.mu.Lock()
|
||||||
defer f.mu.Unlock()
|
defer f.mu.Unlock()
|
||||||
out.Attr = f.Attr
|
out.Attr = f.Attr
|
||||||
out.Attr.Size = f.size
|
out.Size = f.size
|
||||||
return fs.OK
|
return fs.OK
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -659,7 +659,7 @@ func rpcSetActiveExtension(extensionId string) error {
|
||||||
if config.ActiveExtension == extensionId {
|
if config.ActiveExtension == extensionId {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
switch extensionId {
|
switch config.ActiveExtension {
|
||||||
case "atx-power":
|
case "atx-power":
|
||||||
_ = unmountATXControl()
|
_ = unmountATXControl()
|
||||||
case "dc-power":
|
case "dc-power":
|
||||||
|
|
|
@ -68,6 +68,10 @@ func mountImage(imagePath string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("set mass storage image error: %w", err)
|
return fmt.Errorf("set mass storage image error: %w", err)
|
||||||
}
|
}
|
||||||
|
err = setMassStorageImage(imagePath)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("set Mass Storage Image Error: %w", err)
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -476,10 +480,7 @@ func handleUploadChannel(d *webrtc.DataChannel) {
|
||||||
}
|
}
|
||||||
totalBytesWritten += int64(bytesWritten)
|
totalBytesWritten += int64(bytesWritten)
|
||||||
|
|
||||||
sendProgress := false //nolint:staticcheck
|
sendProgress := time.Since(lastProgressTime) >= 200*time.Millisecond
|
||||||
if time.Since(lastProgressTime) >= 200*time.Millisecond {
|
|
||||||
sendProgress = true
|
|
||||||
}
|
|
||||||
if totalBytesWritten >= pendingUpload.Size {
|
if totalBytesWritten >= pendingUpload.Size {
|
||||||
sendProgress = true
|
sendProgress = true
|
||||||
close(uploadComplete)
|
close(uploadComplete)
|
||||||
|
|
|
@ -171,7 +171,7 @@ func runWebSecureServer() {
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
for range stopTLS {
|
for range stopTLS {
|
||||||
websecureLogger.Info().Msg("shutting down websecure server")
|
websecureLogger.Info().Msg("Shutting down websecure server")
|
||||||
err := server.Shutdown(context.Background())
|
err := server.Shutdown(context.Background())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
websecureLogger.Error().Err(err).Msg("failed to shutdown websecure server")
|
websecureLogger.Error().Err(err).Msg("failed to shutdown websecure server")
|
||||||
|
@ -203,7 +203,7 @@ func startWebSecureServer() {
|
||||||
|
|
||||||
func RunWebSecureServer() {
|
func RunWebSecureServer() {
|
||||||
for range startTLS {
|
for range startTLS {
|
||||||
websecureLogger.Info().Msg("starting websecure server, as we have received a start signal")
|
websecureLogger.Info().Msg("Starting websecure server, as we have received a start signal")
|
||||||
if certStore == nil {
|
if certStore == nil {
|
||||||
initCertStore()
|
initCertStore()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue