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

fixed wtf

This commit is contained in:
Dmitry Zuikov 2024-03-15 12:36:25 +03:00
parent f7578a4a8c
commit ec2c1cc317
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/App.hs
View File

@ -141,6 +141,7 @@ runGitCLI o m = do
let endpoints = [ Endpoint @UNIX peerAPI let endpoints = [ Endpoint @UNIX peerAPI
, Endpoint @UNIX refLogAPI , Endpoint @UNIX refLogAPI
, Endpoint @UNIX lwwAPI
, Endpoint @UNIX storageAPI , Endpoint @UNIX storageAPI
] ]

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

@ -74,8 +74,6 @@ importRepoWait lwwKey = do
subscribeLWWRef lwwKey subscribeLWWRef lwwKey
-- void $ try @_ @SomeException (getRefLogMerkl puk)
fetchLWWRef lwwKey fetchLWWRef lwwKey
flip fix (IWaitLWWBlock 20) $ \next -> \case flip fix (IWaitLWWBlock 20) $ \next -> \case
@ -84,9 +82,7 @@ importRepoWait lwwKey = do
throwIO ImportRefLogNotFound throwIO ImportRefLogNotFound
IWaitLWWBlock w -> do IWaitLWWBlock w -> do
fetchLWWRef lwwKey
onProgress ip (ImportWaitLWW w lwwKey) onProgress ip (ImportWaitLWW w lwwKey)
notice $ yellow ("fetchLWWRef" <+> pretty lwwKey)
lww <- readLWWBlock sto lwwKey lww <- readLWWBlock sto lwwKey
case lww of case lww of

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

@ -29,10 +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
notice $ green "fetchLWWRef" <+> pretty key void $ race (pause @'Seconds 1) (callService @RpcLWWRefFetch api key)
r <- race (pause @'Seconds 2) (callService @RpcLWWRefFetch api key)
warn $ "result:" <+> viaShow r
getRefLogMerkle :: (GitPerks m, MonadReader GitEnv m) => RefLogId -> m (Maybe HashRef) getRefLogMerkle :: (GitPerks m, MonadReader GitEnv m) => RefLogId -> m (Maybe HashRef)
getRefLogMerkle puk = do getRefLogMerkle puk = do

8
nix/peer/flake.lock
View File

@ -295,11 +295,11 @@
"suckless-conf": "suckless-conf_2" "suckless-conf": "suckless-conf_2"
}, },
"locked": { "locked": {
"lastModified": 1710493310, "lastModified": 1710494072,
"narHash": "sha256-LeTP5qZvjl4ZY23ktv6mYNuTRKsJenuEajw3Cz8vP70=", "narHash": "sha256-6pZlN9lLxWBzWQXJe34G6UgNjla1FKEAs+fOL9R+vg8=",
"ref": "lwwrepo", "ref": "lwwrepo",
"rev": "9497207115ed51663415c9e066a86bcb615a3cf8", "rev": "f7578a4a8ceb521ce038be257b4628fa2d811ce1",
"revCount": 982, "revCount": 983,
"type": "git", "type": "git",
"url": "http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP" "url": "http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP"
}, },