diff --git a/client/deploy_test.go b/client/deploy_test.go index 0fd711a..d887aa2 100644 --- a/client/deploy_test.go +++ b/client/deploy_test.go @@ -1,13 +1,9 @@ package client import ( - "fmt" "testing" ) func TestDownload(t *testing.T) { - //download(".", "https://kdcc.action2quare.com/houston/_deploys/game/0.18.186.1/game.zip", "", nil) - fmt.Println(pof2(1023, 1024)) - fmt.Println(pof2(1024, 1024)) - fmt.Println(pof2(1025, 1024)) + } diff --git a/main.go b/main.go index 81befda..9422b78 100644 --- a/main.go +++ b/main.go @@ -1,33 +1,15 @@ -//go:build client && server +//go:build !client package main import ( "repositories.action2quare.com/ayo/gocommon/flagx" - "repositories.action2quare.com/ayo/gocommon/logger" - "repositories.action2quare.com/ayo/houston/client" "repositories.action2quare.com/ayo/houston/server" ) -var runAsClient = flagx.Bool("client", false, "") -var runAsServer = flagx.Bool("server", false, "") - func main() { flagx.Parse() - if !*runAsClient && !*runAsServer { - logger.Fatal("client or server flag is needed") - return - } - if *runAsClient { - hc, err := client.NewClient(true) - if err != nil { - logger.Fatal(err) - return - } - hc.Start() - } else if *runAsServer { - svr := server.NewServer() - svr.Start() - } + svr := server.NewServer() + svr.Start() } diff --git a/main_client.go b/main_client.go index e614e1a..7849cec 100644 --- a/main_client.go +++ b/main_client.go @@ -1,4 +1,4 @@ -//go:build client && !server +//go:build client package main diff --git a/main_server.go b/main_server.go deleted file mode 100644 index 57c48f9..0000000 --- a/main_server.go +++ /dev/null @@ -1,15 +0,0 @@ -//go:build !client && server - -package main - -import ( - "repositories.action2quare.com/ayo/gocommon/flagx" - "repositories.action2quare.com/ayo/houston/server" -) - -func main() { - flagx.Parse() - - svr := server.NewServer() - svr.Start() -} diff --git a/server/http_api.go b/server/http_api.go index 4ed1fc1..4a93fb7 100644 --- a/server/http_api.go +++ b/server/http_api.go @@ -1,4 +1,4 @@ -//go:build server +//go:build !client package server diff --git a/server/http_handler.go b/server/http_handler.go index abcbe4d..b9befe0 100644 --- a/server/http_handler.go +++ b/server/http_handler.go @@ -1,4 +1,4 @@ -//go:build server +//go:build !client package server diff --git a/server/monitor.go b/server/monitor.go index 893a1df..ef4619f 100644 --- a/server/monitor.go +++ b/server/monitor.go @@ -1,4 +1,4 @@ -//go:build server +//go:build !client package server diff --git a/server/operation.go b/server/operation.go index 0fc599e..db883cd 100644 --- a/server/operation.go +++ b/server/operation.go @@ -1,4 +1,4 @@ -//go:build server +//go:build !client package server