Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
knowledge-platform
Commits
47184e6c
Commit
47184e6c
authored
4 years ago
by
Mahesh Kumar Gangula
Browse files
Options
Download
Patches
Plain Diff
Issue #000 fix: service-health API for search-service.
parent
e5ac40b8
schema-updates
3.9.0-prod-fix
4.1.0_fixes
AmiableAnil-patch-1
Gcloud_copy
Gcloud_fix
Remove_unwantedCode_Gcloud_fix
actors-test
bulk-upload-comptenecy-mapping
bulk-upload-excelsheet
bulk-upload-test_excel
bulk_upload
code-cleanup
csp-migration
dependabot/maven/platform-core/platform-telemetry/ch.qos.logback-logback-core-1.2.9
dependabot/maven/search-api/search-core/org.apache.httpcomponents-httpclient-4.5.13
ft-spike
knowlg-friday
knowlg-oneclick
local-setup-fix
local-setup-kube
m-4.2.0
master
master-data
new_objecttype
org-target-enhancement
patch-1
patch-2
patch-3
poc_bulk_upload
qs-schema
rahul_bulk_upload_postgres
release-2.10.0
release-3.0.0
release-3.0.1
release-3.1.0
release-3.2.0
release-3.3.0
release-3.4.0
release-3.5.0
release-3.6.0
release-3.6.0.1
release-3.7.0
release-3.8.0
release-3.9.0
release-4.0.0
release-4.1.0
release-4.10.0
release-4.10.1
release-4.2.0
release-4.3.0
release-4.4.0
release-4.5.0
release-4.6.0
release-4.7.0
release-4.7.0-debug
release-4.8.0
release-4.8.0-debug
release-4.9.0
release-4.9.1
release-5.0.0
release-5.0.1
release-5.1.0
release-5.1.0-content
release-5.2.0
release-5.3.0
revert-718-visiblity-private-api
revert-719-assessment-private-read-api
revert-720-visiblity-public-search-api
revert-721-visiblity-private-search-api
review-4.1.0
s-debug
schema-update-4.0
release-5.2.0_RC2
release-5.2.0_RC1
release-5.1.0_RC1
release-5.0.0_RC2
release-5.0.0_RC1
release-4.10.0_RC2
release-4.10.0_RC1
release-4.9.1_RC1
release-4.9.0_RC8
release-4.9.0_RC7
release-4.9.0_RC6
release-4.9.0_RC5
release-4.9.0_RC4
release-4.9.0_RC3
release-4.9.0_RC2
release-4.9.0_RC1
release-4.8.0_RC5
release-4.8.0_RC4
release-4.8.0_RC3
release-4.8.0_RC2
release-4.8.0_RC1
release-4.7.0_RC6
release-4.7.0_RC5
release-4.7.0_RC4
release-4.7.0_RC3
release-4.7.0_RC2
release-4.7.0_RC1
release-4.6.0_RC2
release-4.6.0_RC1
release-4.5.0_RC2
release-4.5.0_RC1
release-4.4.0_RC6
release-4.4.0_RC5
release-4.4.0_RC4
release-4.4.0_RC3
release-4.4.0_RC2
release-4.4.0_RC1
release-4.3.0_RC10
release-4.3.0_RC9
release-4.3.0_RC8
release-4.3.0_RC7
release-4.3.0_RC6
release-4.3.0_RC5
release-4.3.0_RC4
release-4.3.0_RC3
release-4.3.0_RC2
release-4.3.0_RC1
release-4.2.0_RC13
release-4.2.0_RC12
release-4.2.0_RC11
release-4.2.0_RC10
release-4.2.0_RC9
release-4.2.0_RC8
release-4.2.0_RC7
release-4.2.0_RC6
release-4.2.0_RC5
release-4.2.0_RC4
release-4.2.0_RC3
release-4.2.0_RC2
release-4.2.0_RC1
release-4.1.0_RC13
release-4.1.0_RC12
release-4.1.0_RC11
release-4.1.0_RC10
release-4.1.0_RC9
release-4.1.0_RC8
release-4.1.0_RC7
release-4.1.0_RC6
release-4.1.0_RC5
release-4.1.0_RC4
release-4.1.0_RC3
release-4.1.0_RC2
release-4.1.0_RC1
release-4.0.0_RC9
release-4.0.0_RC8
release-4.0.0_RC7
release-4.0.0_RC6
release-4.0.0_RC5
release-4.0.0_RC4
release-4.0.0_RC3
release-4.0.0_RC2
release-4.0.0_RC1
release-3.9.0_RC12
release-3.9.0_RC11
release-3.9.0_RC10
release-3.9.0_RC9
release-3.9.0_RC8
release-3.9.0_RC7
release-3.9.0_RC6
release-3.9.0_RC5
release-3.9.0_RC4
release-3.9.0_RC3
release-3.9.0_RC2
release-3.9.0_RC1
release-3.8.0_RC9
release-3.8.0_RC8
release-3.8.0_RC7
release-3.8.0_RC6
release-3.8.0_RC5
release-3.8.0_RC4
release-3.8.0_RC3
release-3.8.0_RC2
release-3.8.0_RC1
release-3.7.0_RC1
release-3.6.0_RC5
release-3.6.0_RC4
release-3.6.0_RC3
release-3.6.0_RC2
release-3.6.0_RC1
release-3.5.0
release-3.5.0_RC2
release-3.5.0_RC1
release-3.4.0
release-3.4.0_RC2
release-3.4.0_RC1
release-3.3.0_RC10
release-3.3.0_RC9
release-3.3.0_RC8
release-3.3.0_RC7
release-3.3.0_RC6
release-3.3.0_RC5
release-3.3.0_RC4
release-3.3.0_RC3
release-3.3.0_RC2
release-3.3.0_RC1
release-3.2.0_RC9
release-3.2.0_RC8
release-3.2.0_RC7
release-3.2.0_RC6
release-3.2.0_RC5
release-3.2.0_RC4
release-3.2.0_RC3
release-3.2.0_RC2
release-3.2.0_RC1
release-3.1.0
release-3.1.0_RC8
release-3.1.0_RC7
release-3.1.0_RC6
release-3.1.0_RC5
release-3.1.0_RC4
release-3.1.0_RC3
release-3.1.0_RC2
release-3.1.0_RC1
release-3.0.1_RC3
release-3.0.1_RC2
release-3.0.1_RC1
release-3.0.0
release-3.0.0_RC11
release-3.0.0_RC10
release-3.0.0_RC9
release-3.0.0_RC8
release-3.0.0_RC7
release-3.0.0_RC6
release-3.0.0_RC5
release-3.0.0_RC4
release-2.10.0_RC19
release-2.10.0_RC18
release-2.10.0_RC17
release-2.10.0_RC16
release-2.10.0_RC15
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
platform-modules/mimetype-manager/src/test/scala/org/sunbird/mimetype/mgr/impl/EcmlMimeTypeMgrImplTest.scala
+0
-4
...g/sunbird/mimetype/mgr/impl/EcmlMimeTypeMgrImplTest.scala
search-api/search-service/app/controllers/HealthController.scala
+10
-0
...api/search-service/app/controllers/HealthController.scala
search-api/search-service/app/utils/ApiId.scala
+1
-0
search-api/search-service/app/utils/ApiId.scala
search-api/search-service/conf/routes
+1
-0
search-api/search-service/conf/routes
with
12 additions
and
4 deletions
+12
-4
platform-modules/mimetype-manager/src/test/scala/org/sunbird/mimetype/mgr/impl/EcmlMimeTypeMgrImplTest.scala
+
0
−
4
View file @
47184e6c
...
...
@@ -39,8 +39,6 @@ class EcmlMimeTypeMgrImplTest extends AsyncFlatSpec with Matchers with AsyncMock
(
ss
.
uploadDirectory
(
_:
String
,
_:
File
,
_:
Option
[
Boolean
])).
expects
(*,
*,
*)
val
resFuture
=
new
EcmlMimeTypeMgrImpl
().
upload
(
identifier
,
node
,
new
File
(
Resources
.
getResource
(
"validecml.zip"
).
toURI
),
None
)
resFuture
.
map
(
result
=>
{
println
(
"Response: "
+
result
)
result
assert
(
null
!=
result
)
assert
(
result
.
nonEmpty
)
assert
(
"do_123"
==
result
.
getOrElse
(
"identifier"
,
""
))
...
...
@@ -57,8 +55,6 @@ class EcmlMimeTypeMgrImplTest extends AsyncFlatSpec with Matchers with AsyncMock
(
ss
.
uploadDirectory
(
_:
String
,
_:
File
,
_:
Option
[
Boolean
])).
expects
(*,
*,
*)
val
resFuture
=
new
EcmlMimeTypeMgrImpl
().
upload
(
identifier
,
node
,
new
File
(
Resources
.
getResource
(
"validecml_withjson.zip"
).
toURI
),
None
)
resFuture
.
map
(
result
=>
{
println
(
"Response: "
+
result
)
result
assert
(
null
!=
result
)
assert
(
result
.
nonEmpty
)
assert
(
"do_123"
==
result
.
getOrElse
(
"identifier"
,
""
))
...
...
This diff is collapsed.
Click to expand it.
search-api/search-service/app/controllers/HealthController.scala
+
10
−
0
View file @
47184e6c
...
...
@@ -3,6 +3,8 @@ package controllers
import
akka.actor.
{
ActorRef
,
ActorSystem
}
import
handlers.SignalHandler
import
javax.inject.
{
Inject
,
Named
}
import
org.sunbird.common.JsonUtils
import
org.sunbird.common.dto.ResponseHandler
import
play.api.mvc.ControllerComponents
import
utils.
{
ActorNames
,
ApiId
}
...
...
@@ -16,6 +18,14 @@ class HealthController @Inject()(@Named(ActorNames.HEALTH_ACTOR) healthActor: Ac
}
else
{
getResult
(
ApiId
.
APPLICATION_HEALTH
,
healthActor
,
new
org
.
sunbird
.
common
.
dto
.
Request
())
}
}
def
serviceHealth
()
=
Action
.
async
{
implicit
request
=>
if
(
signalHandler
.
isShuttingDown
)
Future
{
ServiceUnavailable
}
else
{
val
response
=
ResponseHandler
.
OK
().
setId
(
ApiId
.
APPLICATION_SERVICE_HEALTH
).
put
(
"healthy"
,
true
)
Future
{
Ok
(
JsonUtils
.
serialize
(
response
)).
as
(
"application/json"
)
}
}
}
}
This diff is collapsed.
Click to expand it.
search-api/search-service/app/utils/ApiId.scala
+
1
−
0
View file @
47184e6c
...
...
@@ -3,6 +3,7 @@ package utils
object
ApiId
{
final
val
APPLICATION_HEALTH
=
"api.search-service.health"
final
val
APPLICATION_SERVICE_HEALTH
=
"api.search.service.health"
final
val
APPLICATION_SEARCH
=
"api.search-service.search"
final
val
APPLICATION_COUNT
=
"api.search-service.count"
}
This diff is collapsed.
Click to expand it.
search-api/search-service/conf/routes
+
1
−
0
View file @
47184e6c
...
...
@@ -2,6 +2,7 @@
# This file defines all application routes (Higher priority routes first)
# ~~~~
GET /health controllers.HealthController.health()
GET /service/health controllers.HealthController.serviceHealth()
#POST /v2/search controllers.SearchController.search()
POST /v3/search controllers.SearchController.search()
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets