github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Clean up ui package

Browse Source
This commit is contained in:
Daniel
2019-10-25 13:29:55 +02:00
parent 90c89eb012
commit eea1ec6a56
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ui/serve.go
View File

@@ -14,14 +14,13 @@ import (
"github.com/safing/portbase/api" "github.com/safing/portbase/api"
"github.com/safing/portbase/log" "github.com/safing/portbase/log"
"github.com/safing/portbase/updater"
"github.com/safing/portmaster/updates" "github.com/safing/portmaster/updates"
) )
var ( var (
apps = make(map[string]*resources.BundleSequence) apps = make(map[string]*resources.BundleSequence)
appsLock sync.RWMutex appsLock sync.RWMutex
assets *resources.BundleSequence
assetsLock sync.RWMutex
) )
func registerRoutes() error { func registerRoutes() error {
@@ -66,7 +65,7 @@ func ServeBundle(defaultModuleName string) func(w http.ResponseWriter, r *http.R
// get file from update system // get file from update system
zipFile, err := updates.GetFile(fmt.Sprintf("ui/modules/%s.zip", moduleName)) zipFile, err := updates.GetFile(fmt.Sprintf("ui/modules/%s.zip", moduleName))
if err != nil { if err != nil {
if err == updates.ErrNotFound { if err == updater.ErrNotFound {
log.Tracef("ui: requested module %s does not exist", moduleName) log.Tracef("ui: requested module %s does not exist", moduleName)
http.Error(w, err.Error(), http.StatusNotFound) http.Error(w, err.Error(), http.StatusNotFound)
} else { } else {