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
9abfe501
Commit
9abfe501
authored
6 years ago
by
raghu
Browse files
Options
Download
Patches
Plain Diff
Issue #SB-6978 feat: cassandra port nos added in urls
parent
cd45f413
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
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-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
+1
-2
src/app.js
src/utils/cassandraUtil.js
+6
-6
src/utils/cassandraUtil.js
with
7 additions
and
8 deletions
+7
-8
src/app.js
+
1
−
2
View file @
9abfe501
...
...
@@ -68,8 +68,7 @@ configUtil.setConfig('LANGUAGE_SERVICE_BASE_URL', languageServiceBaseUrl)
configUtil
.
setConfig
(
'
LANGUAGE_SERVICE_AUTHORIZATION_TOKEN
'
,
'
Bearer
'
+
languageServiceApiKey
)
configUtil
.
setConfig
(
'
SUNBIRD_PORTAL_BASE_URL
'
,
sunbirdPortalBaseUrl
)
process
.
env
.
sunbird_cassandra_ips
=
process
.
env
.
sunbird_cassandra_ips
||
'
127.0.0.1
'
process
.
env
.
sunbird_cassandra_port
=
process
.
env
.
sunbird_cassandra_port
||
9042
process
.
env
.
sunbird_cassandra_urls
=
process
.
env
.
sunbird_cassandra_urls
||
'
127.0.0.1
'
process
.
env
.
dial_code_image_temp_folder
=
'
temp
'
var
app
=
express
()
...
...
This diff is collapsed.
Click to expand it.
src/utils/cassandraUtil.js
+
6
−
6
View file @
9abfe501
...
...
@@ -3,7 +3,7 @@ var LOG = require('sb_logger_util')
var
path
=
require
(
'
path
'
)
var
_
=
require
(
'
lodash
'
)
var
filename
=
path
.
basename
(
__filename
)
var
contactPoints
=
process
.
env
.
sunbird_cassandra_
ip
s
.
split
(
'
,
'
)
var
contactPoints
=
process
.
env
.
sunbird_cassandra_
url
s
.
split
(
'
,
'
)
var
cassandra
=
require
(
'
cassandra-driver
'
)
var
consistency
=
getConsistencyLevel
(
process
.
env
.
sunbird_cassandra_consistency_level
)
var
replicationStrategy
=
getReplicationStrategy
(
process
.
env
.
sunbird_cassandra_replication_strategy
)
...
...
@@ -12,7 +12,6 @@ models.setDirectory(path.join(__dirname, '.', '..', 'models', 'cassandra')).bind
{
clientOptions
:
{
contactPoints
:
contactPoints
,
protocolOptions
:
{
port
:
process
.
env
.
sunbird_cassandra_port
},
keyspace
:
'
dialcodes
'
,
queryOptions
:
{
consistency
:
consistency
}
},
...
...
@@ -46,16 +45,17 @@ function checkCassandraDBHealth (callback) {
}
function
getConsistencyLevel
(
consistency
)
{
let
consistencyValue
=
consistency
&&
_
.
get
(
models
,
`consistencies.
${
consistency
}
`
)
?
_
.
get
(
models
,
`consistencies.
${
consistency
}
`
):
models
.
consistencies
.
one
return
consistencyValue
;
let
consistencyValue
=
consistency
&&
_
.
get
(
models
,
`consistencies.
${
consistency
}
`
)
?
_
.
get
(
models
,
`consistencies.
${
consistency
}
`
)
:
models
.
consistencies
.
one
return
consistencyValue
}
function
getReplicationStrategy
(
replicationStrategy
)
{
try
{
return
JSON
.
parse
(
replicationStrategy
)
}
catch
(
e
)
{
console
.
log
(
"
err in getReplicationStrategy
"
,
e
)
return
{
'
class
'
:
'
SimpleStrategy
'
,
'
replication_factor
'
:
'
1
'
}
console
.
log
(
'
err in getReplicationStrategy
'
,
e
)
return
{
'
class
'
:
'
SimpleStrategy
'
,
'
replication_factor
'
:
1
}
}
}
...
...
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