Skip to content

Commit

Permalink
added http prefix in config files
Browse files Browse the repository at this point in the history
  • Loading branch information
jal347 committed Mar 20, 2024
1 parent 7fb585b commit ae831b7
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 28 deletions.
56 changes: 29 additions & 27 deletions src/config_hub.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

# Refer to biothings.hub.default_config for all configurable settings

DATA_SRC_SERVER = 'localhost'
DATA_SRC_SERVER = "localhost"
DATA_SRC_PORT = 27017
DATA_SRC_DATABASE = 'mygene_src'
DATA_SRC_DATABASE = "mygene_src"

DATA_TARGET_SERVER = 'localhost'
DATA_TARGET_SERVER = "localhost"
DATA_TARGET_PORT = 27017
DATA_TARGET_DATABASE = 'mygene'
DATA_TARGET_DATABASE = "mygene"

HUB_DB_BACKEND = {
"module": "biothings.utils.mongo",
Expand Down Expand Up @@ -41,18 +41,20 @@
"max_retries": 10,
},
},
"index": [{"index": "genedoc_mygene_allspecies_current", "doc_type": "gene"}]
"index": [
{"index": "genedoc_mygene_allspecies_current", "doc_type": "gene"}
],
},
"local": {
"host": "localhost:9200",
"host": "http://localhost:9200",
"indexer": {
"args": {
"timeout": 300,
"retry_on_timeout": True,
"max_retries": 10,
},
},
"index": [{"index": "mygene_gene_allspecies_current", "doc_type": "gene"}]
"index": [{"index": "mygene_gene_allspecies_current", "doc_type": "gene"}],
},
},
}
Expand All @@ -71,9 +73,9 @@
"name": "gene_repository-$(Y)",
"type": "s3",
"settings": {
"bucket": "<SNAPSHOT_BUCKET_NAME>",
"base_path": "mygene.info/$(Y)", # per year
"region": "us-west-2",
"bucket": "<SNAPSHOT_BUCKET_NAME>",
"base_path": "mygene.info/$(Y)", # per year
"region": "us-west-2",
},
"acl": "private",
},
Expand All @@ -95,9 +97,9 @@
"name": "gene_repository-demo-$(Y)",
"type": "s3",
"settings": {
"bucket": "<SNAPSHOT_DEMO_BUCKET_NAME>",
"base_path": "mygene.info/$(Y)", # per year
"region": "us-west-2",
"bucket": "<SNAPSHOT_DEMO_BUCKET_NAME>",
"base_path": "mygene.info/$(Y)", # per year
"region": "us-west-2",
},
"acl": "public",
},
Expand All @@ -108,7 +110,7 @@
# when creating a snapshot, how long should we wait before querying ES
# to check snapshot status/completion ? (in seconds)
"monitor_delay": 10,
}
},
}
}

Expand Down Expand Up @@ -153,7 +155,7 @@
"region": "us-west-2",
"auto": True, # automatically generate diff ? Careful if lots of changes
},
}
},
}
}

Expand All @@ -164,38 +166,38 @@
# Autohub configuration, either from a static definition...
STANDALONE_CONFIG = {
"_default": {
"es_host": "localhost:9200",
"es_host": "http://localhost:9200",
"index": "mygene_test",
"doc_type": "gene"
"doc_type": "gene",
},
"mygene.info": {
"es_host": "prodserver:9200",
"index": "mygene_prod",
"doc_type": "gene"
"doc_type": "gene",
},
}
# ... or using a dynamic indexer factory and ES host (index names are then
# taken from VERSION_URLS and all are managed on one given ES host)
#AUTOHUB_INDEXER_FACTORY = "biothings.hub.dataindex.indexer.DynamicIndexerFactory"
#AUTOHUB_ES_HOST = "localhost:9200"
# AUTOHUB_INDEXER_FACTORY = "biothings.hub.dataindex.indexer.DynamicIndexerFactory"
# AUTOHUB_ES_HOST = "localhost:9200"

# Autohub configuration, either from a static definition...
STANDALONE_CONFIG = {
"_default": {
"es_host": "localhost:9200",
"es_host": "http:/localhost:9200",
"index": "mygene_test",
"doc_type": "gene"
"doc_type": "gene",
},
"mygene.info": {
"es_host": "prodserver:9200",
"index": "mygene_prod",
"doc_type": "gene"
"doc_type": "gene",
},
}
# ... or using a dynamic indexer factory and ES host (index names are then
# taken from VERSION_URLS and all are managed on one given ES host)
#AUTOHUB_INDEXER_FACTORY = "biothings.hub.dataindex.indexer.DynamicIndexerFactory"
#AUTOHUB_ES_HOST = "localhost:9200"
# AUTOHUB_INDEXER_FACTORY = "biothings.hub.dataindex.indexer.DynamicIndexerFactory"
# AUTOHUB_ES_HOST = "localhost:9200"


########################################
Expand All @@ -221,10 +223,10 @@
"zebrafish": {"tax_id": "7955", "assembly": "zv9"},
"thale-cress": {"tax_id": "3702"},
"frog": {"tax_id": "8364", "assembly": "xenTro3"},
"pig": {"tax_id": "9823", "assembly": "susScr2"}
"pig": {"tax_id": "9823", "assembly": "susScr2"},
}

# for running tests locally in our biothings hub with testing api
APITEST_PATH = "/opt/home/mygene/mygene.info/src/tests/data_tests"

APITEST_CONFIG = "config_web_local"
APITEST_CONFIG = "config_web_local"
2 changes: 1 addition & 1 deletion src/config_web.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# *****************************************************************************
# Elasticsearch Settings
# *****************************************************************************
ES_HOST = "localhost:9200"
ES_HOST = "http://localhost:9200"
ES_INDEX = "mygene_current"
ES_DOC_TYPE = "gene"

Expand Down

0 comments on commit ae831b7

Please sign in to comment.