Add nocache option

whyrusleeping · whyrusleeping · commit 1a6c45e52875 · 2015-10-25T22:37:45.000-07:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/core/commands/ipns.go b/core/commands/ipns.go
@@ -45,6 +45,7 @@ Resolve the value of another name:
 	},
 	Options: []cmds.Option{
 		cmds.BoolOption("recursive", "r", "Resolve until the result is not an IPNS name"),
+		cmds.BoolOption("nocache", "n", "Do not used cached entries"),
 	},
 	Run: func(req cmds.Request, res cmds.Response) {
 
@@ -62,15 +63,27 @@ Resolve the value of another name:
 			}
 		}
 
-		var resolver namesys.Resolver
-		resolver = n.Namesys
-		if local, _, _ := req.Option("local").Bool(); local {
+		nocache, _, _ := req.Option("nocache").Bool()
+		local, _, _ := req.Option("local").Bool()
+
+		// default to nodes namesys resolver
+		var resolver namesys.Resolver = n.Namesys
+
+		if local && nocache {
+			res.SetError(errors.New("cannot specify both local and nocache"), cmds.ErrNormal)
+			return
+		}
+
+		if local {
 			offroute := offline.NewOfflineRouter(n.Repo.Datastore(), n.PrivateKey)
 			resolver = namesys.NewRoutingResolver(offroute, 0)
 		}
 
-		var name string
+		if nocache {
+			resolver = namesys.NewNameSystem(n.Routing, n.Repo.Datastore(), 0)
+		}
 
+		var name string
 		if len(req.Arguments()) == 0 {
 			if n.Identity == "" {
 				res.SetError(errors.New("Identity not loaded!"), cmds.ErrNormal)
diff --git a/namesys/routing.go b/namesys/routing.go
@@ -13,6 +13,7 @@ import (
 	pb "github.com/ipfs/go-ipfs/namesys/pb"
 	path "github.com/ipfs/go-ipfs/path"
 	routing "github.com/ipfs/go-ipfs/routing"
+	u "github.com/ipfs/go-ipfs/util"
 	logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
 )
 
@@ -31,25 +32,25 @@ func (r *routingResolver) cacheGet(name string) (path.Path, bool) {
 	r.cachelock.Lock()
 	entry, ok := r.cache[name]
 	r.cachelock.Unlock()
-	if ok && time.Now().Sub(entry.recvd) < r.cachelife {
+	if ok && time.Now().Before(entry.eol) {
 		return entry.val, true
 	}
 
 	return "", false
 }
 
-func (r *routingResolver) cacheSet(name string, val path.Path) {
+func (r *routingResolver) cacheSet(name string, val path.Path, eol time.Time) {
 	r.cachelock.Lock()
 	r.cache[name] = cacheEntry{
-		val:   val,
-		recvd: time.Now(),
+		val: val,
+		eol: eol,
 	}
 	r.cachelock.Unlock()
 }
 
 type cacheEntry struct {
-	val   path.Path
-	recvd time.Time
+	val path.Path
+	eol time.Time
 }
 
 // NewRoutingResolver constructs a name resolver using the IPFS Routing system
@@ -133,13 +134,31 @@ func (r *routingResolver) resolveOnce(ctx context.Context, name string) (path.Pa
 		if err != nil {
 			return "", err
 		}
-		r.cacheSet(name, p)
+
+		cacheTil := time.Now().Add(r.cachelife)
+		eol, ok := checkEOL(entry)
+		if ok && eol.Before(cacheTil) {
+			cacheTil = eol
+		}
+
+		r.cacheSet(name, p, cacheTil)
 		return p, nil
 	} else {
 		// Its an old style multihash record
 		log.Warning("Detected old style multihash record")
 		p := path.FromKey(key.Key(valh))
-		r.cacheSet(name, p)
+		r.cacheSet(name, p, time.Now().Add(r.cachelife))
 		return p, nil
 	}
 }
+
+func checkEOL(e *pb.IpnsEntry) (time.Time, bool) {
+	if e.GetValidityType() == pb.IpnsEntry_EOL {
+		eol, err := u.ParseRFC3339(string(e.GetValidity()))
+		if err != nil {
+			return time.Time{}, false
+		}
+		return eol, true
+	}
+	return time.Time{}, false
+}
