Commit 0e1e638a authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

fix rmq client to publish to any queue

parent ebce717b

.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.2

  TAG: 0.2.0



# This import is for the func_rse_docker_* functions

before_script:

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "ORNL") 
SET(CPACK_RPM_PACKAGE_MAINTAINER "ORNL")



set(CPACK_PACKAGE_VERSION_MAJOR "0")

set(CPACK_PACKAGE_VERSION_MINOR "1")

set(CPACK_PACKAGE_VERSION_PATCH "2")

set(CPACK_PACKAGE_VERSION_MINOR "2")

set(CPACK_PACKAGE_VERSION_PATCH "0")



INCLUDE(CPack)

dockerfiles/Dockerfile

+1 −0
Original line number Diff line number Diff line
@@ -19,5 +19,6 @@ RUN bash ./build.sh DEB 
FROM busybox:glibc AS prod



COPY --from=package /rdb/build/remote-data-broker /

COPY --from=package /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/



CMD ["/remote-data-broker"]

src/common/settings.go

+3 −3
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ type serverSettings struct { 
	}

	Rmq struct {

		Url string

		Queue string

	}

	RmqClient struct {

		Enabled bool

		Queue   string

	}

	LogLevel string

}
@@ -43,7 +43,7 @@ func ReadConfig(fname string) (log.Level, error) { 
	viper.SetDefault("Http.ChunkSize", 100000)

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

	viper.SetDefault("Rmq.Url", "amqp://guest:guest@127.0.0.1:5672")

	viper.SetDefault("Rmq.Queue", "test")

	viper.SetDefault("RmqClient.Queue", "test")

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

	viper.SetDefault("LogLevel", "debug")

	viper.SetDefault("Auth.Enabled", false)

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.2"

	version = "0.2.0"

	rdbApiVersion = "v0.1"

}