diff options
| author | Christian Pointner <equinox@helsinki.at> | 2016-07-13 19:40:31 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2016-07-13 19:40:31 (GMT) |
| commit | 3c67fe07b6103d1bd0ddafbfa7da0544cf7ed83e (patch) | |
| tree | 6f7a60f03ff6a3a40729e58b3ade74a620ab8232 /rhimport/session.go | |
| parent | 6162042d3c40a7b9e49531e85f288014d56332b0 (diff) | |
added normalizer step
always send last/first progress message of a step
Diffstat (limited to 'rhimport/session.go')
| -rw-r--r-- | rhimport/session.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/rhimport/session.go b/rhimport/session.go index b00be17..b0031b1 100644 --- a/rhimport/session.go +++ b/rhimport/session.go @@ -118,6 +118,12 @@ func sessionRun(ctx Context, done chan<- Result) { return } + err = NormalizeFile(&ctx) + if err != nil { + done <- Result{ResponseCode: http.StatusInternalServerError, ErrorString: err.Error()} + return + } + res, err = ImportFile(&ctx) if err != nil { res.ResponseCode = http.StatusInternalServerError @@ -233,6 +239,10 @@ func (self *Session) dispatchRequests() { if lastProgress == nil { self.callProgressHandler(&p) pt.Reset(self.progressRateLimit) + } else if lastProgress.Step != p.Step { + self.callProgressHandler(lastProgress) + self.callProgressHandler(&p) + pt.Reset(self.progressRateLimit) } lastProgress = &p progressPending++ |