Windows: Fix startAssistant to not wait for ever for a non-daemonizing process
Seemed to fix several problems.
This commit is contained in:
parent
8952ccec1b
commit
36e66997c6
2 changed files with 12 additions and 8 deletions
|
@ -86,10 +86,13 @@ newAssistantUrl repo = do
|
||||||
threadDelay 100000 -- 1/10th of a second
|
threadDelay 100000 -- 1/10th of a second
|
||||||
a
|
a
|
||||||
|
|
||||||
{- Returns once the assistant has daemonized, but possibly before it's
|
{- Does not wait for assistant to be listening for web connections.
|
||||||
- listening for web connections. -}
|
-
|
||||||
|
- On windows, the assistant does not daemonize, which is why the forkIO is
|
||||||
|
- done.
|
||||||
|
-}
|
||||||
startAssistant :: FilePath -> IO ()
|
startAssistant :: FilePath -> IO ()
|
||||||
startAssistant repo = do
|
startAssistant repo = void $ forkIO $ do
|
||||||
program <- readProgramFile
|
program <- readProgramFile
|
||||||
(_, _, _, pid) <-
|
(_, _, _, pid) <-
|
||||||
createProcess $
|
createProcess $
|
||||||
|
|
|
@ -33,11 +33,10 @@ now! --[[Joey]]
|
||||||
|
|
||||||
Also needs gsasl, which is not in cygwin.
|
Also needs gsasl, which is not in cygwin.
|
||||||
See <http://josefsson.org/gsasl4win/README.html>
|
See <http://josefsson.org/gsasl4win/README.html>
|
||||||
* Switching between local repos in webapp hangs.
|
* View debug log is empty in windows -- all logs go to console.
|
||||||
* After adding a local repo and trying to switch to it, and rebooting,
|
This messes up a few parts of UI that direct user to the debug log.
|
||||||
starting git-annex from the menu failed with `file://C:\Documents does
|
Should try to get rid of the console, but only once ssh passwords
|
||||||
not exist`. The local repo was `C:\Documents and Settings\...\...`
|
(and possibly gpg) are not prompted there anymore.
|
||||||
* View debug log is empty in windows -- all log must goes to console.
|
|
||||||
* Local pairing seems to fail, after acking on Linux box, it stalls.
|
* Local pairing seems to fail, after acking on Linux box, it stalls.
|
||||||
* rsync.net setup failed. Seems to have generated a hostname including
|
* rsync.net setup failed. Seems to have generated a hostname including
|
||||||
the directory somehow.
|
the directory somehow.
|
||||||
|
@ -51,6 +50,8 @@ now! --[[Joey]]
|
||||||
* Incremental fsck sets the sticky bit to record when a file is fscked,
|
* Incremental fsck sets the sticky bit to record when a file is fscked,
|
||||||
and this is not done on windows, so fsck doesn't behave incrementally
|
and this is not done on windows, so fsck doesn't behave incrementally
|
||||||
there.
|
there.
|
||||||
|
* Deleting a git repository from inside the webapp fails "RemoveDirectory
|
||||||
|
permision denined ... file is being used by another process"
|
||||||
|
|
||||||
## stuff needing testing
|
## stuff needing testing
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue