Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-dms3
Commits
8940b8d4
Commit
8940b8d4
authored
10 years ago
by
Brian Tiger Chow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(gcr/s) rename datastore to routing backend
parent
eb8db2ec
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
routing/grandcentral/server.go
routing/grandcentral/server.go
+5
-5
No files found.
routing/grandcentral/server.go
View file @
8940b8d4
...
...
@@ -16,7 +16,7 @@ import (
// Server handles routing queries using a database backend
type
Server
struct
{
local
peer
.
ID
datastore
datastore
.
ThreadSafeDatastore
routingBackend
datastore
.
ThreadSafeDatastore
peerstore
peer
.
Peerstore
*
proxy
.
Loopback
// so server can be injected into client
}
...
...
@@ -52,7 +52,7 @@ func (s *Server) handleMessage(
switch
req
.
GetType
()
{
case
dhtpb
.
Message_GET_VALUE
:
rawRecord
,
err
:=
getRoutingRecord
(
s
.
datastore
,
util
.
Key
(
req
.
GetKey
()))
rawRecord
,
err
:=
getRoutingRecord
(
s
.
routingBackend
,
util
.
Key
(
req
.
GetKey
()))
if
err
!=
nil
{
return
""
,
nil
}
...
...
@@ -62,7 +62,7 @@ func (s *Server) handleMessage(
case
dhtpb
.
Message_PUT_VALUE
:
// TODO before merging: verifyRecord(req.GetRecord())
putRoutingRecord
(
s
.
datastore
,
util
.
Key
(
req
.
GetKey
()),
req
.
GetRecord
())
putRoutingRecord
(
s
.
routingBackend
,
util
.
Key
(
req
.
GetKey
()),
req
.
GetRecord
())
return
p
,
req
// TODO before merging: verify that we should return record
case
dhtpb
.
Message_FIND_NODE
:
...
...
@@ -79,13 +79,13 @@ func (s *Server) handleMessage(
case
dhtpb
.
Message_ADD_PROVIDER
:
storeProvidersToPeerstore
(
s
.
peerstore
,
p
,
req
.
GetProviderPeers
())
if
err
:=
putRoutingProviders
(
s
.
datastore
,
util
.
Key
(
req
.
GetKey
()),
req
.
GetProviderPeers
());
err
!=
nil
{
if
err
:=
putRoutingProviders
(
s
.
routingBackend
,
util
.
Key
(
req
.
GetKey
()),
req
.
GetProviderPeers
());
err
!=
nil
{
return
""
,
nil
}
return
""
,
nil
case
dhtpb
.
Message_GET_PROVIDERS
:
providers
,
err
:=
getRoutingProviders
(
s
.
local
,
s
.
datastore
,
util
.
Key
(
req
.
GetKey
()))
providers
,
err
:=
getRoutingProviders
(
s
.
local
,
s
.
routingBackend
,
util
.
Key
(
req
.
GetKey
()))
if
err
!=
nil
{
return
""
,
nil
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment