diff options
Diffstat (limited to 'rhimport/session.go')
| -rw-r--r-- | rhimport/session.go | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/rhimport/session.go b/rhimport/session.go index 39c02a4..993575a 100644 --- a/rhimport/session.go +++ b/rhimport/session.go @@ -207,6 +207,26 @@ func (s *session) attachUploader() (resp attachUploaderResponse) { return } +// func cleanupFiles(ctx *Context, res *Result) { +// if ctx.DeleteSourceFile { +// ctx.dbglog.Printf("importer: removing file: %s", ctx.SourceFile) +// if err := os.Remove(ctx.SourceFile); err != nil { +// ctx.stdlog.Printf("importer: error removing source file: %s", err) +// return +// } +// if ctx.DeleteSourceDir { +// dir := path.Dir(ctx.SourceFile) +// ctx.dbglog.Printf("importer: also removing directory: %s", dir) +// if err := os.Remove(dir); err != nil { +// ctx.stdlog.Printf("importer: error removing source directory: %s", err) +// } +// } +// } else { +// res.SourceFile = "tmp://" + strings.TrimPrefix(ctx.SourceFile, ctx.conf.TempDir) +// } +// return +// } + func (s *session) dispatchRequests() { defer func() { if s.cancelUploader != nil { @@ -385,14 +405,19 @@ func (s *session) cleanup() { // close(s.addProgressChan) // close(s.addDoneChan) // close(s.attachUploader) + s.ctx.RemoveTempWorkDir() s.ctx.dbglog.Printf("Session: cleanup is now done") } -func newSession(ctx *Context, removeFunc func()) (s *session) { +func newSession(ctx *Context, removeFunc func()) (s *session, err error) { s = &session{} s.state = _SESSION_NEW s.removeFunc = removeFunc s.ctx = *ctx + if err = s.ctx.CreateTempWorkDir(); err != nil { + return + } + s.quit = make(chan bool, 1) s.done = make(chan bool) s.timer = time.NewTimer(10 * time.Second) |