voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

debug

This commit is contained in:
Dmitry Zuikov 2024-03-15 12:01:50 +03:00
parent 3cd1668451
commit 9497207115
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hbs2-peer/app/RPC2/LWWRef.hs
View File

@ -12,6 +12,7 @@ import HBS2.Peer.Proto.LWWRef
import HBS2.Peer.Proto.LWWRef.Internal import HBS2.Peer.Proto.LWWRef.Internal
import HBS2.Storage import HBS2.Storage
import HBS2.Net.Messaging.Unix import HBS2.Net.Messaging.Unix
import HBS2.Misc.PrettyStuff
import PeerTypes import PeerTypes
@ -49,7 +50,7 @@ instance LWWRefContext m => HandleMethod m RpcLWWRefFetch where
handleMethod key = do handleMethod key = do
co <- getRpcContext @LWWRefAPI co <- getRpcContext @LWWRefAPI
debug $ "rpc.LWWRefFetch" <+> pretty key debug $ green "rpc.LWWRefFetch" <+> pretty key
let penv = rpcPeerEnv co let penv = rpcPeerEnv co
liftIO $ withPeerM penv $ do liftIO $ withPeerM penv $ do

4
hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/Import.hs
View File

@ -85,7 +85,9 @@ importRepoWait lwwKey = do
IWaitLWWBlock w -> do IWaitLWWBlock w -> do
onProgress ip (ImportWaitLWW w lwwKey) onProgress ip (ImportWaitLWW w lwwKey)
lww <- readLWWBlock @L4Proto sto lwwKey debug $ yellow ("fetchLWWRef" <+> pretty lwwKey)
fetchLWWRef lwwKey
lww <- readLWWBlock sto lwwKey
case lww of case lww of
Nothing -> do Nothing -> do

2
hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/RefLog.hs
View File

@ -29,7 +29,7 @@ subscribeLWWRef puk = do
fetchLWWRef :: (GitPerks m, MonadReader GitEnv m) => LWWRefKey HBS2Basic -> m () fetchLWWRef :: (GitPerks m, MonadReader GitEnv m) => LWWRefKey HBS2Basic -> m ()
fetchLWWRef key = do fetchLWWRef key = do
api <- asks _lwwRefAPI api <- asks _lwwRefAPI
void $ race (pause @'Seconds 1) (callService @RpcLWWRefFetch api key) void $ race (pause @'Seconds 2) (callService @RpcLWWRefFetch api key)
getRefLogMerkle :: (GitPerks m, MonadReader GitEnv m) => RefLogId -> m (Maybe HashRef) getRefLogMerkle :: (GitPerks m, MonadReader GitEnv m) => RefLogId -> m (Maybe HashRef)

13
nix/peer/flake.lock
View File

@ -295,17 +295,16 @@
"suckless-conf": "suckless-conf_2" "suckless-conf": "suckless-conf_2"
}, },
"locked": { "locked": {
"lastModified": 1709273510, "lastModified": 1710431896,
"narHash": "sha256-wyerw00pnZq64wQGg+azHnLWzDz4C7PvBqCK3U5ejRI=", "narHash": "sha256-yQ52vtX92Ys4xqsPDCIqOrR5HBVE+rJ+VagaHc9017c=",
"ref": "totally-new-download", "ref": "lwwrepo",
"rev": "a6e955aa611c3f9485976ce7eba33570a43f2eb7", "rev": "3cd16684515a93bbf985891ed8e9913382484fbf",
"revCount": 1036, "revCount": 981,
"type": "git", "type": "git",
"url": "http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP" "url": "http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP"
}, },
"original": { "original": {
"ref": "totally-new-download", "ref": "lwwrepo",
"rev": "a6e955aa611c3f9485976ce7eba33570a43f2eb7",
"type": "git", "type": "git",
"url": "http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP" "url": "http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP"
} }

2
nix/peer/flake.nix
View File

@ -7,7 +7,7 @@
extra-container.url = "github:erikarvstedt/extra-container"; extra-container.url = "github:erikarvstedt/extra-container";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
hbs2.url = hbs2.url =
"git+http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP?ref=totally-new-download&rev=a6e955aa611c3f9485976ce7eba33570a43f2eb7"; "git+http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP?ref=lwwrepo";
hbs2.inputs.nixpkgs.follows = "nixpkgs"; hbs2.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";