eosswedenorg/antelope-api-healthcheck
1
0
Fork 0
mirror of https://github.com/eosswedenorg/antelope-api-healthcheck synced 2026-07-04 12:03:43 +02:00
Code Releases Activity

src/server.go: rename arguments.block_time to num_blocks. and convert to seconds for v1/contract but not v2.

Browse source
This commit is contained in:
Henrik Hautakoski 2022-05-31 10:22:27 +02:00
parent a3be529b78
commit 99958e2165
No known key found for this signature in database
GPG key ID: 608414D93E862CCD
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/server.go
View file

@ -15,18 +15,18 @@ type arguments struct {
api string api string
url string url string
host string host string
block_time int num_blocks int
} }
func createApi(a *arguments) (api.ApiInterface, error) { func createApi(a *arguments) (api.ApiInterface, error) {
switch a.api { switch a.api {
case "v1": case "v1":
return api.NewEosioV1(eosapi.ReqParams{Url: a.url, Host: a.host}, float64(a.block_time)), nil return api.NewEosioV1(eosapi.ReqParams{Url: a.url, Host: a.host}, float64(a.num_blocks / 2)), nil
case "v2": case "v2":
return api.NewEosioV2(eosapi.ReqParams{Url: a.url, Host: a.host}, int64(a.block_time / 2)), nil return api.NewEosioV2(eosapi.ReqParams{Url: a.url, Host: a.host}, int64(a.num_blocks)), nil
case "contract": case "contract":
return api.NewEosioContract(a.url, float64(a.block_time)), nil return api.NewEosioContract(a.url, float64(a.num_blocks / 2)), nil
} }
return nil, fmt.Errorf("Invalid API '%s'", a.api) return nil, fmt.Errorf("Invalid API '%s'", a.api)
@ -39,7 +39,7 @@ func onTcpMessage(c *tcp_server.Client, args string) {
a := arguments{ a := arguments{
api: "v1", api: "v1",
block_time: 10, num_blocks: 10,
} }
// Parse arguments. // Parse arguments.
@ -60,7 +60,7 @@ func onTcpMessage(c *tcp_server.Client, args string) {
// Old format: <url> <version> <api> <block_time> // Old format: <url> <version> <api> <block_time>
if utils.IsUrl(split[0]) { if utils.IsUrl(split[0]) {
logger.Warn("Deprecated format. Please change to the new format: <api>|<url>[|<block_time>|<host>]") logger.Warn("Deprecated format. Please change to the new format: <api>|<url>[|<num_blocks>|<host>]")
// 1. url (scheme + ip/domain + port) // 1. url (scheme + ip/domain + port)
a.url = split[0] a.url = split[0]
@ -70,11 +70,11 @@ func onTcpMessage(c *tcp_server.Client, args string) {
a.api = split[1] a.api = split[1]
} }
// 3. Block time // 3. num blocks
if len(split) > 2 { if len(split) > 2 {
num, err := strconv.ParseInt(split[2], 10, 32) num, err := strconv.ParseInt(split[2], 10, 32)
if err == nil { if err == nil {
a.block_time = int(num) a.num_blocks = int(num)
} }
} }
@ -102,11 +102,11 @@ func onTcpMessage(c *tcp_server.Client, args string) {
// 2. url (scheme + ip/domain + port) // 2. url (scheme + ip/domain + port)
a.url = split[1] a.url = split[1]
// 3. Block time. // 3. num blocks
if len(split) > 2 { if len(split) > 2 {
num, err := strconv.ParseInt(split[2], 10, 32) num, err := strconv.ParseInt(split[2], 10, 32)
if err == nil { if err == nil {
a.block_time = int(num) a.num_blocks = int(num)
} }
} }