Skip to content

Fix namespace for spray configuration parameters #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skavulya wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix namespace for spray configuration parameters #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions rest-server/src/main/resources/reference.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,14 @@ slick {
logLevel = INFO
}

spray.can.server {
request-timeout = ${trustedanalytics.atk.api.request-timeout}
ssl-encryption = off
}

# 8m is default, causes problems if UDF references large variables
spray.can.client.parsing.max-content-length = 32m

trustedanalytics.atk {
spray.can.server {
request-timeout = ${trustedanalytics.atk.api.request-timeout}
ssl-encryption = off
}

# 8m is default, causes problems if UDF references large variables
spray.can.client.parsing.max-content-length = 64m

api {
identifier = "ia"
Expand Down
2 changes: 1 addition & 1 deletion rest-server/src/main/scala/org/trustedanalytics/atk/rest/RestServerConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ object RestServerConfig {
val serviceMode: String = config.getString("trustedanalytics.atk.api.service-mode")

/** Scheme for Rest Service to bind with (http or https) */
val schemeIsHttps: Boolean = config.getBoolean("spray.can.server.ssl-encryption")
val schemeIsHttps: Boolean = config.getBoolean("trustedanalytics.atk.spray.can.server.ssl-encryption")

/** Location of the Java keystore file */
val keyStoreFile: String = config.getString("trustedanalytics.atk.component.archives.rest-server.key-store-file")
Expand Down