diff options
| author | Pjotr Prins | 2018-09-15 09:01:13 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2018-09-15 09:01:13 +0000 |
| commit | 0b88b9afd30a4afec910ae057f8d9dbfddd5c83b (patch) | |
| tree | ba05604bd7908b1ed1123e3e35ac266fa950833b /wqflask/utility | |
| parent | dd12fbe6d9a429d29e676c7a6c50c13b56899cc9 (diff) | |
| parent | ec45dcbd4b61d51eff27e67d437bcdfad126580f (diff) | |
| download | genenetwork2-0b88b9afd30a4afec910ae057f8d9dbfddd5c83b.tar.gz | |
Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testing
Diffstat (limited to 'wqflask/utility')
| -rw-r--r-- | wqflask/utility/corr_result_helpers.py | 2 | ||||
| -rw-r--r-- | wqflask/utility/elasticsearch_tools.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wqflask/utility/corr_result_helpers.py b/wqflask/utility/corr_result_helpers.py index ef644d85..b543c589 100644 --- a/wqflask/utility/corr_result_helpers.py +++ b/wqflask/utility/corr_result_helpers.py @@ -15,7 +15,7 @@ def normalize_values(a_values, b_values): a_new = [] b_new = [] for counter in range(min_length): - if a_values[counter] and b_values[counter]: + if (a_values[counter] or a_values[counter] == 0) and (b_values[counter] or b_values[counter] == 0): a_new.append(a_values[counter]) b_new.append(b_values[counter]) diff --git a/wqflask/utility/elasticsearch_tools.py b/wqflask/utility/elasticsearch_tools.py index 293a9ae6..15cdd0bc 100644 --- a/wqflask/utility/elasticsearch_tools.py +++ b/wqflask/utility/elasticsearch_tools.py @@ -63,7 +63,7 @@ def get_elasticsearch_connection(for_user=True): es = Elasticsearch([{ "host": ELASTICSEARCH_HOST, "port": ELASTICSEARCH_PORT - }]) if (ELASTICSEARCH_HOST and ELASTICSEARCH_PORT) else None + }], timeout=30, retry_on_timeout=True) if (ELASTICSEARCH_HOST and ELASTICSEARCH_PORT) else None if for_user: setup_users_index(es) |