steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mason: make upload timeout configurable, bump default to 1 hour for erg's mom's dialup

release
Slava Pestov 2010-09-15 22:53:54 -07:00
parent 5378f2a0c7
commit 77db248759
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extra/mason/common/common.factor
View File

@ -38,12 +38,17 @@ M: unix (really-delete-tree) delete-tree ;
[ iota ] dip [ iota ] dip
'[ drop @ f ] attempt-all drop ; inline '[ drop @ f ] attempt-all drop ; inline
: upload-process ( process -- )
#! Give network operations and shell commands at most
#! 30 minutes to complete, to catch hangs.
>process upload-timeout get >>timeout try-output-process ;
:: upload-safely ( local username host remote -- ) :: upload-safely ( local username host remote -- )
remote ".incomplete" append :> temp remote ".incomplete" append :> temp
{ username "@" host ":" temp } concat :> scp-remote { username "@" host ":" temp } concat :> scp-remote
scp-command get :> scp scp-command get :> scp
ssh-command get :> ssh ssh-command get :> ssh
5 [ { scp local scp-remote } short-running-process ] retry 5 [ { scp local scp-remote } upload-process ] retry
5 [ { ssh host "-l" username "mv" temp remote } short-running-process ] retry ; 5 [ { ssh host "-l" username "mv" temp remote } short-running-process ] retry ;
: eval-file ( file -- obj ) : eval-file ( file -- obj )

8
extra/mason/config/config.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2008, 2010 Eduardo Cavazos, Slava Pestov. ! Copyright (C) 2008, 2010 Eduardo Cavazos, Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: system io.files io.pathnames namespaces kernel accessors USING: calendar system io.files io.pathnames namespaces kernel
assocs ; accessors assocs ;
IN: mason.config IN: mason.config
! (Optional) Location for build directories ! (Optional) Location for build directories
@ -97,6 +97,10 @@ SYMBOL: upload-username
! Directory with binary packages. ! Directory with binary packages.
SYMBOL: upload-directory SYMBOL: upload-directory
! Upload timeout
SYMBOL: upload-timeout
1 hours upload-timeout set-global
! Optional: override ssh and scp command names ! Optional: override ssh and scp command names
SYMBOL: scp-command SYMBOL: scp-command
scp-command [ "scp" ] initialize scp-command [ "scp" ] initialize