archive/nntpchan
Archived
1
0
Fork 0
Code

fixes

Browse Source
This commit is contained in:
Jeff Becker 2017-09-09 11:04:37 -04:00
parent eed8c07ef6
commit 7165f6eb4a
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/backends/nntpchand/src/nntpchan/lib/nntp/conn_v1.go
View File

@ -885,7 +885,7 @@ func (c *v1Conn) readArticle(newpost bool, hooks EventHooks) (ps PolicyStatus, e
fpath, err := c.storage.StoreArticle(r, msgid.String(), e.Newsgroup().String()) fpath, err := c.storage.StoreArticle(r, msgid.String(), e.Newsgroup().String())
r.Close() r.Close()
if err == nil { if err == nil || err == io.EOF {
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"pkg": "nntp-conn", "pkg": "nntp-conn",
"msgid": msgid, "msgid": msgid,

29
contrib/backends/nntpchand/src/nntpchan/lib/store/fs.go
View File

@ -39,6 +39,8 @@ func (fs FilesystemStorage) GetWatermark(newsgroup string) (hi, lo uint64, err e
var hdr textproto.MIMEHeader var hdr textproto.MIMEHeader
hdr, err = fs.getMetadataForNewsgroup(newsgroup) hdr, err = fs.getMetadataForNewsgroup(newsgroup)
if err == nil { if err == nil {
log.Debugf("hdr = %s", hdr)
log.Debugf("hiwater = %s", hdr.Get(HighWaterHeader))
hi, err = strconv.ParseUint(hdr.Get(HighWaterHeader), 10, 64) hi, err = strconv.ParseUint(hdr.Get(HighWaterHeader), 10, 64)
if err == nil { if err == nil {
lo, err = strconv.ParseUint(hdr.Get(LowWaterHeader), 10, 64) lo, err = strconv.ParseUint(hdr.Get(LowWaterHeader), 10, 64)
@ -52,21 +54,27 @@ func (fs FilesystemStorage) getMetadataForNewsgroup(newsgroup string) (hdr textp
fp := fs.metadataFileForNewsgroup(newsgroup) fp := fs.metadataFileForNewsgroup(newsgroup)
_, err = os.Stat(fp) _, err = os.Stat(fp)
if os.IsNotExist(err) { if os.IsNotExist(err) {
log.Infof("create metadata for %s", newsgroup)
f, err = os.OpenFile(fp, os.O_RDWR|os.O_CREATE, 0600) f, err = os.OpenFile(fp, os.O_RDWR|os.O_CREATE, 0600)
if err == nil { if err == nil {
c := textproto.NewConn(f)
h := make(textproto.MIMEHeader) h := make(textproto.MIMEHeader)
h.Set(HighWaterHeader, "0") h.Set(HighWaterHeader, "0")
c := textproto.NewConn(f) h.Set(LowWaterHeader, "0")
for k := range hdr { for k := range h {
for _, v := range h[k] { for _, v := range h[k] {
err = c.PrintfLine("%s: %s", k, v) err = c.PrintfLine("%s: %s", k, v)
if err != nil { if err != nil {
c.Close() c.Close()
f.Close()
log.Errorf("failed to write metadata file: %s", err)
return return
} }
} }
} }
c.PrintfLine("")
c.Close() c.Close()
f.Close()
} }
} }
f, err = os.OpenFile(fp, os.O_RDWR, 0600) f, err = os.OpenFile(fp, os.O_RDWR, 0600)
@ -74,6 +82,7 @@ func (fs FilesystemStorage) getMetadataForNewsgroup(newsgroup string) (hdr textp
c := textproto.NewConn(f) c := textproto.NewConn(f)
hdr, err = c.ReadMIMEHeader() hdr, err = c.ReadMIMEHeader()
c.Close() c.Close()
f.Close()
} }
return return
} }
@ -88,7 +97,7 @@ func (fs FilesystemStorage) nextIDForNewsgroup(newsgroup string) (id uint64, err
if err == nil { if err == nil {
hdr.Set(HighWaterHeader, fmt.Sprintf("%d", id)) hdr.Set(HighWaterHeader, fmt.Sprintf("%d", id))
var f *os.File var f *os.File
f, err = os.OpenFile(fs.metadataFileForNewsgroup(newsgroup), os.O_WRONLY, 0600) f, err = os.OpenFile(fs.metadataFileForNewsgroup(newsgroup), os.O_WRONLY|os.O_CREATE, 0600)
if err == nil { if err == nil {
c := textproto.NewConn(f) c := textproto.NewConn(f)
for k := range hdr { for k := range hdr {
@ -96,11 +105,14 @@ func (fs FilesystemStorage) nextIDForNewsgroup(newsgroup string) (id uint64, err
err = c.PrintfLine("%s: %s", k, v) err = c.PrintfLine("%s: %s", k, v)
if err != nil { if err != nil {
c.Close() c.Close()
f.Close()
return return
} }
} }
} }
c.PrintfLine("")
c.Close() c.Close()
f.Close()
} }
} }
} }
@ -234,13 +246,16 @@ func (fs FilesystemStorage) StoreArticle(r io.Reader, msgid, newsgroup string) (
nntpid, err = fs.nextIDForNewsgroup(newsgroup) nntpid, err = fs.nextIDForNewsgroup(newsgroup)
if err == nil { if err == nil {
err = os.Symlink(filepath.Join("..", "..", "articles", msgid), filepath.Join(g, fmt.Sprintf("%d", nntpid))) err = os.Symlink(filepath.Join("..", "..", "articles", msgid), filepath.Join(g, fmt.Sprintf("%d", nntpid)))
} else {
log.Errorf("invalid metadata for newsgroup: %s", err.Error())
} }
if err != nil { if err != nil {
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"pkg": "fs-store", "pkg": "fs-store",
"msgid": msgid, "msgid": msgid,
"group": newsgroup, "group": newsgroup,
}).Debug("failed to link article") "reason": err.Error(),
}).Error("failed to link article")
} }
} else { } else {
log.WithFields(log.Fields{ log.WithFields(log.Fields{