From eb9257cdc73ea312a19107d311fea8e2074fd580 Mon Sep 17 00:00:00 2001 From: Young Bu Park Date: Mon, 7 Oct 2019 20:33:14 -0700 Subject: [PATCH 1/2] Change the http app channel port env var to DAPR_HTTP_PORT (#79) --- docs/get-started-dapr-actor.md | 2 +- src/Microsoft.Dapr.Actors/Constants.cs | 2 +- src/Microsoft.Dapr.Actors/DaprHttpInteractor.cs | 2 +- src/Microsoft.Dapr.Client/DaprUris.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/get-started-dapr-actor.md b/docs/get-started-dapr-actor.md index 9eefd891..fd1534db 100644 --- a/docs/get-started-dapr-actor.md +++ b/docs/get-started-dapr-actor.md @@ -389,7 +389,7 @@ In order to validate and debug actor service and client, we need to run actor se MyActorClient will console out if it calls actor hosted in MyActorService successfully. - > If you specify the different dapr runtime http port (default port: 3500), you need to set DAPR_PORT environment variable before running the client. + > If you specify the different dapr runtime http port (default port: 3500), you need to set DAPR_HTTP_PORT environment variable before running the client. ```bash Success diff --git a/src/Microsoft.Dapr.Actors/Constants.cs b/src/Microsoft.Dapr.Actors/Constants.cs index 5a0d763d..3601eee0 100644 --- a/src/Microsoft.Dapr.Actors/Constants.cs +++ b/src/Microsoft.Dapr.Actors/Constants.cs @@ -13,7 +13,7 @@ namespace Microsoft.Dapr.Actors public const string RequestIdHeaderName = "X-DaprRequestId"; public const string RequestHeaderName = "X-DaprRequestHeader"; public const string ErrorResponseHeaderName = "X-DaprErrorResponseHeader"; - public const string DaprPortEnvironmentVariable = "DAPR_PORT"; + public const string DaprHttpPortEnvironmentVariable = "DAPR_HTTP_PORT"; public const string Dapr = "dapr"; public const string Config = "config"; public const string State = "state"; diff --git a/src/Microsoft.Dapr.Actors/DaprHttpInteractor.cs b/src/Microsoft.Dapr.Actors/DaprHttpInteractor.cs index 5f18f500..c19c6fb6 100644 --- a/src/Microsoft.Dapr.Actors/DaprHttpInteractor.cs +++ b/src/Microsoft.Dapr.Actors/DaprHttpInteractor.cs @@ -40,7 +40,7 @@ namespace Microsoft.Dapr.Actors params DelegatingHandler[] delegateHandlers) { // Get Dapr port from Environment Variable if it has been overridden. - var daprPort = Environment.GetEnvironmentVariable(Constants.DaprPortEnvironmentVariable); + var daprPort = Environment.GetEnvironmentVariable(Constants.DaprHttpPortEnvironmentVariable); if (daprPort != null) { this.daprPort = daprPort; diff --git a/src/Microsoft.Dapr.Client/DaprUris.cs b/src/Microsoft.Dapr.Client/DaprUris.cs index 68708c06..0706ef86 100644 --- a/src/Microsoft.Dapr.Client/DaprUris.cs +++ b/src/Microsoft.Dapr.Client/DaprUris.cs @@ -11,6 +11,6 @@ namespace Microsoft.Dapr { public const string StatePath = "/v1.0/state"; - public static string DefaultPort => Environment.GetEnvironmentVariable("DAPR_PORT") ?? "3500"; + public static string DefaultPort => Environment.GetEnvironmentVariable("DAPR_HTTP_PORT") ?? "3500"; } } \ No newline at end of file From acb6ca75ea6c571dc4dadb10b8d51d1f61f682b8 Mon Sep 17 00:00:00 2001 From: Young Bu Park Date: Tue, 8 Oct 2019 17:41:19 -0700 Subject: [PATCH 2/2] upgrade to 0.6.0-preview02 (#82) --- properties/dapr_common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/properties/dapr_common.props b/properties/dapr_common.props index 83b19ef5..e5a9670b 100644 --- a/properties/dapr_common.props +++ b/properties/dapr_common.props @@ -22,7 +22,7 @@ 0 6 0 - -preview01 + -preview02 $(NupkgMajorVersion).$(NupkgMinorVersion).$(NupkgPatchVersion)$(NupkgPreviewTag)