Commit ebce717b authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

use EndpointUrl instead of Host

parent 7558f973

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ stages: 
variables:

  GIT_STRATEGY: clone

  CONTAINER_RDM_URL: "${CI_REGISTRY_IMAGE}/remote-data-broker"

  TAG: 0.1.1

  TAG: 0.1.2



# This import is for the func_rse_docker_* functions

before_script:

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ SET(CPACK_RPM_PACKAGE_MAINTAINER "ORNL") 


set(CPACK_PACKAGE_VERSION_MAJOR "0")

set(CPACK_PACKAGE_VERSION_MINOR "1")

set(CPACK_PACKAGE_VERSION_PATCH "1")

set(CPACK_PACKAGE_VERSION_PATCH "2")



INCLUDE(CPack)

src/common/settings.go

+6 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ type serverSettings struct { 
	}

	Http struct {

		Enabled     bool

		Host      string

		EndpointUrl string

		Port        int

		ChunkSize   int

		Timeout     int
@@ -38,7 +38,7 @@ func ReadConfig(fname string) (log.Level, error) { 
	viper.SetDefault("CatCommand", "cat $filename")

	viper.SetDefault("TestCommand", "test -r $filename")

	viper.SetDefault("Http.Enabled", true)

	viper.SetDefault("Http.Host", "http://localhost")

	viper.SetDefault("Http.EndpointUrl", "http://localhost")

	viper.SetDefault("Http.Port", 9000)

	viper.SetDefault("Http.ChunkSize", 100000)

	viper.SetDefault("Http.Timeout", 3)

src/common/version.go

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ var version string 
// Default build-time variable for library-import.

// This file is overridden on build with build-time informations.

func init() {

	version = "0.1.1"

	version = "0.1.2"

	rdbApiVersion = "v0.1"

}

src/http_server/download_remote.go

+1 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ import ( 
	"remote_data_broker/common"

	log "remote_data_broker/logger"

	"remote_data_broker/utils"

	"strconv"

	"time"

)
@@ -66,7 +65,7 @@ func downloadFromRemote(w http.ResponseWriter, downloadRequest fileDownloadReque 
	channels[id] = channel



	msg := common.FileMessage{

		Endpoint: common.Settings.Http.Host + ":" + strconv.Itoa(common.Settings.Http.Port) + "/" +

		Endpoint: common.Settings.Http.EndpointUrl + "/" +

			common.GetRdbApiVersion() + "/upload/" + id,

		Filename: downloadRequest.FileName,

		Token:    downloadRequest.Token,