Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Cai <jcai@gitlab.com>2020-04-07 02:32:44 +0300
committerJohn Cai <jcai@gitlab.com>2020-04-07 02:32:44 +0300
commit98103b3d885761f3b2ed6aff7beaee355ef9ec0b (patch)
tree830133a038bd5d4d14cea17b4a953a986b1f7313
parent1aca342f790509147604e0adce09e9b7dd667905 (diff)
parent9d01d90e8522834f29ade7276bb248f9360340c4 (diff)
Merge branch 'sh-fix-lint-errors' into 'master'
Fix go fmt errors See merge request gitlab-org/gitaly!2022
-rw-r--r--internal/praefect/datastore/datastore.go4
-rw-r--r--internal/praefect/metrics/prometheus.go1
2 files changed, 2 insertions, 3 deletions
diff --git a/internal/praefect/datastore/datastore.go b/internal/praefect/datastore/datastore.go
index 0e5f14654..4b71fa55b 100644
--- a/internal/praefect/datastore/datastore.go
+++ b/internal/praefect/datastore/datastore.go
@@ -100,8 +100,8 @@ type ReplJob struct {
RelativePath string // source for replication
State JobState
Attempts int
- Params Params // additional information required to run the job
- CorrelationID string // from original request
+ Params Params // additional information required to run the job
+ CorrelationID string // from original request
CreatedAt time.Time // when has the job been created?
}
diff --git a/internal/praefect/metrics/prometheus.go b/internal/praefect/metrics/prometheus.go
index 47bdc1626..19cb24eb9 100644
--- a/internal/praefect/metrics/prometheus.go
+++ b/internal/praefect/metrics/prometheus.go
@@ -22,7 +22,6 @@ func RegisterReplicationDelay(conf promconfig.Config) (metrics.HistogramVec, err
return replicationDelay, prometheus.Register(replicationDelay)
}
-
// RegisterReplicationLatency creates and registers a prometheus histogram
// to observe replication latency times
func RegisterReplicationLatency(conf promconfig.Config) (metrics.HistogramVec, error) {