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-mw-service
Commits
73a6e4c4
Commit
73a6e4c4
authored
7 years ago
by
Harishkumar Gangula
Browse files
Options
Download
Patches
Plain Diff
Issue #SB-2312 fix: telemetry pdata update and made mandatory
parent
6a35c3b3
master
dependabot/npm_and_yarn/src/async-2.6.4
dependabot/npm_and_yarn/src/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/flat-and-mocha-5.0.2
dependabot/npm_and_yarn/src/handlebars-4.7.7
dependabot/npm_and_yarn/src/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/lodash-4.17.21
dependabot/npm_and_yarn/src/minimist-and-project-sunbird/telemetry-sdk-and-handlebars-and-mkdirp-1.2.8
release-3.6.0
release-4.3.0
release-4.8.0
release-5.2.0
release-5.3.0
release-5.6.0
release-6.0.0
v1.13.3
v1.13
v1.12
v1.11.1
v1.11
v1.10.1
v1.10
v1.9
v1.8.2
v1.8
v1.7.1
v1.7
v1.6
v1.5.1
v1.5
tmp-testPR
tmp-sunbird-bootcamp
tmp-rjshrjndrn-patch-1
tmp-revert-118-testPR
tmp-revert-110-logs
tmp-revert-99-revert-98-revert-97-revert-96-rjshrjndrn-patch-1
tmp-revert-98-revert-97-revert-96-rjshrjndrn-patch-1
tmp-revert-97-revert-96-rjshrjndrn-patch-1
tmp-revert-96-rjshrjndrn-patch-1
tmp-release-sonarcloud
tmp-release-2.6.0
tmp-release-2.3.0
tmp-release-2.1.1
tmp-release-2.1.0
tmp-release-2.1.0_pluginSearch
tmp-release-2.0.0
tmp-release-1.15
tmp-release-1.14.3
tmp-release-1.14
tmp-release-1.14-sp3
tmp-release-1.8.3
tmp-refactored-dev-deploy
tmp-master
tmp-loadtest
tmp-load-testing
tmp-jenkins-test
tmp-jenkins-pipeline
tmp-final-variable-refac
tmp-dial-assemble-api
tmp-content-update-read
tmp-circleci
release-5.6.0_RC1
release-5.2.0_RC1
release-4.8.5_RC1
release-4.8.0_RC2
release-4.8.0_RC1
release-4.3.0_RC1
release-3.8.0_RC3
release-3.8.0_RC2
release-3.8.0_RC1
release-3.7.0_RC2
release-3.7.0_RC1
release-3.6.0_RC1
release-3.2.0_RC2
release-3.2.0_RC1
release-3.1.0
release-3.1.0_RC2
release-3.1.0_RC1
release-3.0.1_RC1
release-3.0.0
release-3.0.0_RC1
release-2.10.0
release-2.10.0_RC2
release-2.10.0_RC1
release-2.9.0_RC3
release-2.9.0_RC2
release-2.9.0_RC1
release-2.8.0
release-2.8.0_RC4
release-2.8.0_RC3
release-2.8.0_RC2
release-2.8.0_RC1
release-2.7.0
release-2.7.0_RC2
release-2.7.0_RC1
release-2.6.0
release-2.6.0_RC4
release-2.6.0_RC3
release-2.6.0_RC2
release-2.6.0_RC1
release-2.3.0
release-2.3.0_RC2
release-2.3.0_RC1
release-2.1.1_RC1
release-2.1.0_RC2
release-2.1.0_RC1
release-2.0.0
release-2.0.0_RC5
release-2.0.0_RC4
release-2.0.0_RC3
release-2.0.0_RC2
release-2.0.0_RC1
release-1.15.0
release-1.15_RC7
release-1.15_RC6
release-1.15_RC5
release-1.15_RC4
release-1.15_RC3
release-1.15_RC2
release-1.15_RC1
release-1.14.0
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app.js
+9
-2
src/app.js
src/config/contentProviderApiConfig.json
+1
-1
src/config/contentProviderApiConfig.json
with
10 additions
and
3 deletions
+10
-3
src/app.js
+
9
−
2
View file @
73a6e4c4
...
...
@@ -19,7 +19,7 @@ const port = process.env.sunbird_content_service_port ? process.env.sunbird_cont
globalEkstepProxyBaseUrl
=
process
.
env
.
sunbird_content_plugin_base_url
?
process
.
env
.
sunbird_content_plugin_base_url
:
'
https://qa.ekstep.in
'
const
contentProviderBaseUrl
=
process
.
env
.
sunbird_content_provider_api_base_url
?
process
.
env
.
sunbird_content_provider_api_base_url
:
'
https://
qa
.ekstep.in/api
'
const
contentProviderBaseUrl
=
process
.
env
.
sunbird_content_provider_api_base_url
?
process
.
env
.
sunbird_content_provider_api_base_url
:
'
https://
dev
.ekstep.in/api
'
const
contentProviderApiKey
=
process
.
env
.
sunbird_content_provider_api_key
const
learnerServiceApiKey
=
process
.
env
.
sunbird_learner_service_api_key
...
...
@@ -29,6 +29,8 @@ const learnerServiceLocalBaseUrl = process.env.sunbird_learner_service_local_bas
?
process
.
env
.
sunbird_learner_service_local_base_url
:
'
http://learner-service:9000
'
const
producerId
=
process
.
env
.
sunbird_content_service_producer_id
configUtil
.
setContentProviderApi
(
contentProviderApiConfig
.
API
)
configUtil
.
setConfig
(
'
BASE_URL
'
,
contentProviderBaseUrl
)
configUtil
.
setConfig
(
'
Authorization_TOKEN
'
,
'
Bearer
'
+
contentProviderApiKey
)
...
...
@@ -104,6 +106,10 @@ require('./middlewares/proxy.middleware')(app)
// Create server
this
.
server
=
http
.
createServer
(
app
).
listen
(
port
,
function
()
{
console
.
log
(
'
server running at PORT [%d]
'
,
port
)
if
(
!
producerId
)
{
console
.
error
(
'
please set environment variable process.env.sunbird_content_service_producer_id to start service
'
)
process
.
exit
(
1
)
}
})
// Close server, when we start for test cases
...
...
@@ -122,12 +128,13 @@ global.imageBatchProcess.on('exit', function () {
// Telemetry initialization
const
telemetryBatchSize
=
parseInt
(
process
.
env
.
sunbird_telemetry_sync_batch_size
,
10
)
||
20
telemtryEventConfig
.
pdata
.
id
=
producerId
const
telemetryConfig
=
{
pdata
:
telemtryEventConfig
.
pdata
,
method
:
'
POST
'
,
batchsize
:
telemetryBatchSize
,
endpoint
:
configUtil
.
getConfig
(
'
TELEMETRY
'
),
host
:
configUtil
.
getConfig
(
'
BASE_URL
'
)
,
host
:
learnerServiceLocalBaseUrl
,
authtoken
:
configUtil
.
getConfig
(
'
Authorization_TOKEN
'
)
}
...
...
This diff is collapsed.
Click to expand it.
src/config/contentProviderApiConfig.json
+
1
−
1
View file @
73a6e4c4
...
...
@@ -58,7 +58,7 @@
"FRAMEWORK_CATEGORY_INSTANCE_CREATE_URI"
:
"/framework/v3/category/create"
,
"FRAMEWORK_CATEGORY_INSTANCE_UPDATE_URI"
:
"/framework/v3/category/update"
,
"TELEMETRY"
:
"/
data/v3
/telemetry"
,
"TELEMETRY"
:
"/
v1
/telemetry"
,
"SUBMIT_DATA_EXHAUST_URI"
:
"/data/v2/dataset/request/submit"
,
"LIST_DATA_EXHAUST_URI"
:
"/data/v2/dataset/request/list"
,
...
...
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