Commit 1b5483c3 authored by Changzheng Liu's avatar Changzheng Liu Committed by Dylan Griffith

Set Correlation ID as env when calling indexer

parent 8ca2d45a
...@@ -84,6 +84,7 @@ module Gitlab ...@@ -84,6 +84,7 @@ module Gitlab
'GITALY_CONNECTION_INFO' => gitaly_connection_info, 'GITALY_CONNECTION_INFO' => gitaly_connection_info,
'FROM_SHA' => from_sha, 'FROM_SHA' => from_sha,
'TO_SHA' => to_sha, 'TO_SHA' => to_sha,
'CORRELATION_ID' => Labkit::Correlation::CorrelationId.current_id,
'SSL_CERT_FILE' => OpenSSL::X509::DEFAULT_CERT_FILE, 'SSL_CERT_FILE' => OpenSSL::X509::DEFAULT_CERT_FILE,
'SSL_CERT_DIR' => OpenSSL::X509::DEFAULT_CERT_DIR 'SSL_CERT_DIR' => OpenSSL::X509::DEFAULT_CERT_DIR
} }
......
...@@ -143,6 +143,7 @@ describe Gitlab::Elastic::Indexer do ...@@ -143,6 +143,7 @@ describe Gitlab::Elastic::Indexer do
'GITALY_CONNECTION_INFO' => gitaly_connection_data.to_json, 'GITALY_CONNECTION_INFO' => gitaly_connection_data.to_json,
'ELASTIC_CONNECTION_INFO' => elasticsearch_config.to_json, 'ELASTIC_CONNECTION_INFO' => elasticsearch_config.to_json,
'RAILS_ENV' => Rails.env, 'RAILS_ENV' => Rails.env,
'CORRELATION_ID' => Labkit::Correlation::CorrelationId.current_id,
'FROM_SHA' => expected_from_sha, 'FROM_SHA' => expected_from_sha,
'TO_SHA' => to_sha 'TO_SHA' => to_sha
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment