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

Remove deprecated code

Browse Source
This commit is contained in:
Daniel
2020-04-24 11:31:26 +02:00
parent fe7d146360
commit 6d6b03cac3
5 changed files with 0 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
status/module.go
View File

@@ -37,8 +37,6 @@ func start() error {
// load status into atomic getters // load status into atomic getters
atomicUpdateSelectedSecurityLevel(status.SelectedSecurityLevel) atomicUpdateSelectedSecurityLevel(status.SelectedSecurityLevel)
atomicUpdatePortmasterStatus(status.PortmasterStatus)
atomicUpdateGate17Status(status.Gate17Status)
// update status // update status
status.updateThreatMitigationLevel() status.updateThreatMitigationLevel()

42
status/set.go
View File

@@ -45,40 +45,6 @@ func setSelectedSecurityLevel(level uint8) {
} }
} }
// SetPortmasterStatus sets the current Portmaster status.
func SetPortmasterStatus(pmStatus uint8, msg string) {
switch pmStatus {
case StatusOff, StatusError, StatusWarning, StatusOk:
status.Lock()
defer status.Unlock()
status.PortmasterStatus = pmStatus
status.PortmasterStatusMsg = msg
atomicUpdatePortmasterStatus(pmStatus)
go status.Save()
default:
log.Errorf("status: tried to set portmaster to invalid status: %d", pmStatus)
}
}
// SetGate17Status sets the current Gate17 status.
func SetGate17Status(g17Status uint8, msg string) {
switch g17Status {
case StatusOff, StatusError, StatusWarning, StatusOk:
status.Lock()
defer status.Unlock()
status.Gate17Status = g17Status
status.Gate17StatusMsg = msg
atomicUpdateGate17Status(g17Status)
go status.Save()
default:
log.Errorf("status: tried to set gate17 to invalid status: %d", g17Status)
}
}
// update functions for atomic stuff // update functions for atomic stuff
func atomicUpdateActiveSecurityLevel(level uint8) { func atomicUpdateActiveSecurityLevel(level uint8) {
atomic.StoreUint32(activeSecurityLevel, uint32(level)) atomic.StoreUint32(activeSecurityLevel, uint32(level))
@@ -87,11 +53,3 @@ func atomicUpdateActiveSecurityLevel(level uint8) {
func atomicUpdateSelectedSecurityLevel(level uint8) { func atomicUpdateSelectedSecurityLevel(level uint8) {
atomic.StoreUint32(selectedSecurityLevel, uint32(level)) atomic.StoreUint32(selectedSecurityLevel, uint32(level))
} }
func atomicUpdatePortmasterStatus(status uint8) {
atomic.StoreUint32(portmasterStatus, uint32(status))
}
func atomicUpdateGate17Status(status uint8) {
atomic.StoreUint32(gate17Status, uint32(status))
}

2
status/set_test.go
View File

@@ -7,7 +7,5 @@ func TestSet(t *testing.T) {
// only test for panics // only test for panics
// TODO: write real tests // TODO: write real tests
setSelectedSecurityLevel(0) setSelectedSecurityLevel(0)
SetPortmasterStatus(0, "")
SetGate17Status(0, "")
} }

8
status/status.go
View File

@@ -28,16 +28,8 @@ type SystemStatus struct {
ActiveSecurityLevel uint8 ActiveSecurityLevel uint8
SelectedSecurityLevel uint8 SelectedSecurityLevel uint8
PortmasterStatus uint8
PortmasterStatusMsg string
Gate17Status uint8
Gate17StatusMsg string
ThreatMitigationLevel uint8 ThreatMitigationLevel uint8
Threats map[string]*Threat Threats map[string]*Threat
UpdateStatus string
} }
// Save saves the SystemStatus to the database // Save saves the SystemStatus to the database

18
status/updates.go
View File

@@ -1,18 +0,0 @@
package status
// Update status options
const (
UpdateStatusCurrentStable = "stable"
UpdateStatusCurrentBeta = "beta"
UpdateStatusAvailable = "available" // restart or reboot required
UpdateStatusFailed = "failed" // check logs
)
// SetUpdateStatus updates the system status with a new update status.
func SetUpdateStatus(newStatus string) {
status.Lock()
status.UpdateStatus = newStatus
status.Unlock()
go status.Save()
}