Clean API models and keychain helpers
This commit is contained in:
@@ -131,10 +131,10 @@ class APIv2_13: BaseAPIClient, ServerAPIProtocol {
|
||||
typealias UtilizationType = APIv2_13.Utilization
|
||||
|
||||
private enum Endpoint: String {
|
||||
case systemInfo = "/api/v2.13/system/info"
|
||||
case load = "/api/v2.13/metrics/load"
|
||||
case memory = "/api/v2.13/metrics/memory"
|
||||
case utilization = "/api/v2.13/metrics/utilization"
|
||||
case systemInfo = "/api/v2/system/info"
|
||||
case load = "/api/v2/metrics/load"
|
||||
case memory = "/api/v2/metrics/memory"
|
||||
case utilization = "/api/v2/metrics/utilization"
|
||||
|
||||
func url(baseURL: URL) -> URL {
|
||||
return baseURL.appendingPathComponent(self.rawValue)
|
||||
@@ -342,11 +342,11 @@ private extension APIv2_13 {
|
||||
serverTime: meta.serverTime,
|
||||
uptime: meta.uptime.formatted,
|
||||
processCount: utilization.processCount,
|
||||
emailsInQueue: utilization.emailsInQueue,
|
||||
apacheVersion: components.apache,
|
||||
phpVersion: components.php,
|
||||
mysqlVersion: components.mysql,
|
||||
mariadbVersion: components.mariadb,
|
||||
emailsInQueue: utilization.emailsInQueue,
|
||||
operatingSystem: operatingSystem.map {
|
||||
ServerInfo.OperatingSystem(
|
||||
label: $0.label,
|
||||
|
||||
Reference in New Issue
Block a user