diff options
| author | Christian Pointner <equinox@helsinki.at> | 2016-07-15 13:56:30 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2016-07-15 13:56:30 (GMT) |
| commit | 456d72b7d4c93cb98ed8ddc5cd5e3a2382b5daa2 (patch) | |
| tree | 2b3e6699cb5fdcbd422d1528a22d96d0a98cb444 /src/rhimportd/ctrlWatchDir.go | |
| parent | 2647031ac19a4d36ca73f3bce935b5ffdaa61b14 (diff) | |
normalizer can now be canceld - this changes how to call the NormalizeFile function
Diffstat (limited to 'src/rhimportd/ctrlWatchDir.go')
| -rw-r--r-- | src/rhimportd/ctrlWatchDir.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rhimportd/ctrlWatchDir.go b/src/rhimportd/ctrlWatchDir.go index 7b185c0..2335c8f 100644 --- a/src/rhimportd/ctrlWatchDir.go +++ b/src/rhimportd/ctrlWatchDir.go @@ -149,10 +149,14 @@ func watchDirHandler(conf *rhimport.Config, db *rddb.DBChan, ctx *rhimport.Conte return } - if err = rhimport.NormalizeFile(ctx); err != nil { + if res, err = rhimport.NormalizeFile(ctx); err != nil { watchDirErrorResponse(filename, http.StatusInternalServerError, err.Error(), "") return } + if res.ResponseCode != http.StatusOK { + watchDirErrorResponse(filename, res.ResponseCode, res.ErrorString, "") + return + } if res, err = rhimport.ImportFile(ctx); err != nil { watchDirErrorResponse(filename, http.StatusInternalServerError, err.Error(), res.SourceFile) |