Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Configure build information
id: build_information
run: |
if [[ ${{ github.ref_type }} == "tag" ]]; then
echo "::set-output name=release_name::$( echo ${{ github.ref_name }} )"
else
echo "::set-output name=release_name::$( echo unknown )"
fi

- name: Build and push
uses: docker/build-push-action@v2.7.0
with:
Expand All @@ -66,5 +75,5 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache
build-args: |
TibiadataBuildBuilder=github
TibiadataBuildRelease=${{ github.ref_name }}
TibiadataBuildRelease=${{ steps.build_information.outputs.release_name }}
TibiadataBuildCommit=${{ github.sha }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM golang:1.17.5

# get args
ARG TibiadataBuildBuilder=dockerfile
ARG TibiadataBuildRelease=unknown
ARG TibiadataBuildRelease=-
ARG TibiadataBuildCommit=-

# create and set workingfolder
Expand Down
28 changes: 17 additions & 11 deletions src/webserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ func main() {
// logging start of TibiaData
log.Printf("[info] TibiaData API starting..")

// running the TibiaDataInitializer function
TibiaDataInitializer()

// logging build information
log.Printf("[info] TibiaData API release: %s", TibiadataBuildRelease)
log.Printf("[info] TibiaData API build: %s", TibiadataBuildBuilder)
log.Printf("[info] TibiaData API commit: %s", TibiadataBuildCommit)
log.Printf("[info] TibiaData API edition: %s", TibiadataBuildEdition)

// setting application to ReleaseMode if DEBUG_MODE is false
if !getEnvAsBool("DEBUG_MODE", false) {
// setting GIN_MODE to ReleaseMode
Expand Down Expand Up @@ -124,16 +133,18 @@ func main() {
})
})

// logging build information
log.Printf("[info] TibiaData API release: %s", TibiadataBuildRelease)
log.Printf("[info] TibiaData API build: %s", TibiadataBuildBuilder)
log.Printf("[info] TibiaData API commit: %s", TibiadataBuildCommit)
log.Printf("[info] TibiaData API edition: %s", TibiadataBuildEdition)

// Start the router
router.Run() // listen and serve on 0.0.0.0:8080 (for windows "localhost:8080")
}

// TibiaDataInitializer func - init things at beginning
func TibiaDataInitializer() {
// setting TibiadataBuildEdition
if isEnvExist("TIBIADATA_EDITION") {
TibiadataBuildEdition = getEnv("TIBIADATA_EDITION", "open-source")
}
}

/*
// TibiaDataAPIHandleErrorResponse func - handling of responses..
func TibiaDataAPIHandleErrorResponse(c *gin.Context, s1 string, s2 string, s3 string) {
Expand Down Expand Up @@ -176,11 +187,6 @@ func TibiadataUserAgentGenerator(version int) string {
TibiadataHost = "+https://" + TibiadataHost
}

// setting TibiadataBuildEdition
if isEnvExist("TIBIADATA_EDITION") {
TibiadataBuildEdition = getEnv("TIBIADATA_EDITION", "open-source")
}

// adding details in parenthesis
useragentDetails := []string{
"release/" + TibiadataBuildRelease,
Expand Down