Merge pull request #36 from Automattic/increase-time-out

Increase S3 client timeout to 2 hours

Author: crazytonyli

Sources/hostmgr/helpers/Logging.swift

@@ -1,9 +1,11 @@
+import Foundation
 import Logging
 
 var logger = Logger(label: "com.automattic.hostmgr")
 
 func initializeLoggingSystem() {
-    logger.logLevel = .trace
+    let logLevelFromEnv = ProcessInfo.processInfo.environment["LOG_LEVEL"].flatMap { Logger.Level(rawValue: $0) }
+    logger.logLevel = logLevelFromEnv ?? .info
     LoggingSystem.bootstrap { label in
         MultiplexLogHandler([
             StreamLogHandler.standardError(label: label)

Sources/hostmgr/helpers/S3.swift

@@ -125,7 +125,7 @@ struct S3Manager {
         for bucket: String,
         in region: Region
     ) throws -> S3 {
-        let timeout = TimeAmount.minutes(30)
+        let timeout = TimeAmount.hours(2)
         let s3Client = S3(client: aws, region: region, timeout: timeout)
 
         guard Configuration.shared.allowAWSAcceleratedTransfer else {

Sources/hostmgr/main.swift

@@ -5,10 +5,11 @@ import libhostmgr
 
 struct Hostmgr: ParsableCommand {
 
-    private var appVersion = "0.14.1"
+    private static var appVersion = "0.14.2"
 
     static var configuration = CommandConfiguration(
         abstract: "A utility for managing VM hosts",
+        version: appVersion,
         subcommands: [
             VMCommand.self,
             SyncCommand.self,
@@ -18,25 +19,6 @@ struct Hostmgr: ParsableCommand {
             BenchmarkCommand.self,
             ConfigCommand.self
         ])
-
-    @Flag(help: "Print the version and exit")
-    var version: Bool = false
-
-    func run() throws {
-        guard version == false else {
-            print(appVersion)
-            return
-        }
-
-        logger.debug("Starting Up")
-
-        guard Configuration.isValid else {
-            print("Invalid configuration – exiting")
-            throw ExitCode(1)
-        }
-
-        throw CleanExit.helpRequest(self)
-    }
 }
 
 initializeLoggingSystem()