Unverified Commit a43fa4f3 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #121 from pastorsx/sp_dev_resourceUrl 

new MEEP_PUBLIC_URL
parents 99a1a808 8e10e5d9

go-apps/meep-loc-serv/server/loc-serv.go

+9 −5
Original line number Diff line number Diff line
@@ -116,12 +116,16 @@ func Init() (err error) { 
	}

	log.Info("MEEP_SANDBOX_NAME: ", sandboxName)



	// Retrieve Host URL from environment variable

	// hostUrl is the url of the node serving the resourceURL

	// Retrieve public url address where service is reachable, if not present, use Host URL environment variable

	hostUrl, err = url.Parse(strings.TrimSpace(os.Getenv("MEEP_PUBLIC_URL")))

	if err != nil || hostUrl == nil || hostUrl.String() == "" {

		hostUrl, err = url.Parse(strings.TrimSpace(os.Getenv("MEEP_HOST_URL")))

		if err != nil {

			hostUrl = new(url.URL)

		}

	log.Info("MEEP_HOST_URL: ", hostUrl)

	}

	log.Info("resource URL: ", hostUrl)



	// Set base path

	basePath = "/" + sandboxName + LocServBasePath

go-apps/meep-metrics-engine/server/v2/metrics-engine.go

+9 −5
Original line number Diff line number Diff line
@@ -100,12 +100,16 @@ func Init() (err error) { 
	}

	log.Info("MEEP_SANDBOX_NAME: ", sandboxName)



	// Retrieve Root URL from environment variable

	// hostUrl is the url of the node serving the resourceURL

	// Retrieve public url address where service is reachable, if not present, use Host URL environment variable

	hostUrl, err = url.Parse(strings.TrimSpace(os.Getenv("MEEP_PUBLIC_URL")))

	if err != nil || hostUrl == nil || hostUrl.String() == "" {

		hostUrl, err = url.Parse(strings.TrimSpace(os.Getenv("MEEP_HOST_URL")))

		if err != nil {

			hostUrl = new(url.URL)

		}

	log.Info("MEEP_HOST_URL: ", hostUrl)

	}

	log.Info("resource URL: ", hostUrl)



	// Set base path

	basePath = "/" + sandboxName + metricsBasePath

go-apps/meep-rnis/server/rnis.go

+9 −5
Original line number Diff line number Diff line
@@ -103,12 +103,16 @@ func Init() (err error) { 
	}

	log.Info("MEEP_SANDBOX_NAME: ", sandboxName)



	// Retrieve Host URL from environment variable

	// hostUrl is the url of the node serving the resourceURL

	// Retrieve public url address where service is reachable, if not present, use Host URL environment variable

	hostUrl, err = url.Parse(strings.TrimSpace(os.Getenv("MEEP_PUBLIC_URL")))

	if err != nil || hostUrl == nil || hostUrl.String() == "" {

		hostUrl, err = url.Parse(strings.TrimSpace(os.Getenv("MEEP_HOST_URL")))

		if err != nil {

			hostUrl = new(url.URL)

		}

	log.Info("MEEP_HOST_URL: ", hostUrl)

	}

	log.Info("resource URL: ", hostUrl)



	// Set base path

	basePath = "/" + sandboxName + rnisBasePath