summaryrefslogtreecommitdiff
path: root/Logs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-05 18:57:06 -0600
committerGravatar Joey Hess <joey@kitenet.net>2012-07-05 18:57:06 -0600
commita92f5589fcf5549832914fdee34596818bfdc583 (patch)
tree45712848f8a7bddf19c90fc082ee657c40243a38 /Logs
parent0c563c39dfcd515b115aa37c03551dceffb882c0 (diff)
unfinished (and unbuildable) work toward separate transfer processes
Diffstat (limited to 'Logs')
-rw-r--r--Logs/Transfer.hs5
1 files changed, 0 insertions, 5 deletions
diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs
index 12ab8ff11..54f98da5c 100644
--- a/Logs/Transfer.hs
+++ b/Logs/Transfer.hs
@@ -14,7 +14,6 @@ import qualified Git
import Types.Remote
import qualified Fields
-import Control.Concurrent
import System.Posix.Types
import Data.Time.Clock
@@ -36,7 +35,6 @@ data Transfer = Transfer
data TransferInfo = TransferInfo
{ startedTime :: Maybe UTCTime
, transferPid :: Maybe ProcessID
- , transferThread :: Maybe ThreadId
, transferRemote :: Maybe Remote
, bytesComplete :: Maybe Integer
, associatedFile :: Maybe FilePath
@@ -79,7 +77,6 @@ transfer t file a = do
info <- liftIO $ TransferInfo
<$> (Just <$> getCurrentTime)
<*> pure Nothing -- pid not stored in file, so omitted for speed
- <*> pure Nothing -- threadid not stored in file, so omitted for speed
<*> pure Nothing -- not 0; transfer may be resuming
<*> pure Nothing
<*> pure file
@@ -158,7 +155,6 @@ writeTransferInfo :: TransferInfo -> String
writeTransferInfo info = unlines
-- transferPid is not included; instead obtained by looking at
-- the process that locks the file.
- -- transferThread is not included; not relevant for other processes
[ show $ startedTime info
-- bytesComplete is not included; changes too fast
, fromMaybe "" $ associatedFile info -- comes last; arbitrary content
@@ -172,7 +168,6 @@ readTransferInfo pid s =
<*> pure (Just pid)
<*> pure Nothing
<*> pure Nothing
- <*> pure Nothing
<*> pure (if null filename then Nothing else Just filename)
_ -> Nothing
where