Megatest

Check-in [efe2d43275]
Login
Overview
Comment:Use local rather than env variables to determine log and host
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | v1.60-nbfake-stderr
Files: files | file ages | folders
SHA1: efe2d432753ef140f184ee93e9b8db889c765a03
User & Date: tyardeni on 2014-10-29 15:40:00
Other Links: branch diff | manifest | tags
Context
2014-10-29
15:46
Fix local variable name in nbfake Closed-Leaf check-in: 794eaa8cad user: tyardeni tags: v1.60-nbfake-stderr
15:40
Use local rather than env variables to determine log and host check-in: efe2d43275 user: tyardeni tags: v1.60-nbfake-stderr
15:17
Remove debug code from nbfake check-in: bb277556b4 user: tyardeni tags: v1.60-nbfake-stderr
Changes

Modified utils/nbfake from [6c86d9c83e] to [2b1cbc2712].

29
30
31
32
33
34
35
36






37

38






39
40
41
42
43


44
45
46
47
48
49
50
51
52
53
54
55
56
57

58
59

60
61
62

63
29
30
31
32
33
34
35

36
37
38
39
40
41
42
43

44
45
46
47
48
49
50
51
52


53
54
55
56
57
58
59
60
61
62
63
64
65
66
67

68
69

70
71
72

73
74







-
+
+
+
+
+
+

+
-
+
+
+
+
+
+



-
-
+
+













-
+

-
+


-
+

#==============================================================================

# Can't always trust $PWD
CURRWD=$(pwd)

# Make sure nbfake host and logfile are set. Fall back to old-style variable names

if [[ -z "$NBFAKE_HOST" && -n "$TARGETHOST" ]];     then NBFAKE_HOST=$TARGETHOST;     fi
if [[ -z "$NBFAKE_HOST" && -n "$TARGETHOST" ]]; then 
  MY_NBFAKE_HOST=$TARGETHOST     
else
  MY_NBFAKE_HOST=$NBFAKE_HOST
  unset NBFAKE_HOST
fi


if [[ -z "$NBFAKE_LOG" && -n "$TARGETHOST_LOGF" ]]; then NBFAKE_LOG=$TARGETHOST_LOGF; fi
if [[ -z "$NBFAKE_LOG" && -n "$TARGETHOST_LOGF" ]]; then 
  MY_NBFAKE_LOG=$TARGETHOST_LOGF
else
  MY_NBFAKE_LOG=$NBFAKE_LOG
  unset NBFAKE_LOG
fi

# Set default nbfake log

if [[ -z "$NBFAKE_LOG" ]]; then
  NBFAKE_LOG=NBFAKE-$(date +%GWW%V.%u_%T)
if [[ -z "$MY_NBFAKE_LOG" ]]; then
  MY_NBFAKE_LOG=NBFAKE-$(date +%GWW%V.%u_%T)
fi

#==============================================================================
# Run and log
#==============================================================================

cat <<__EOF >&2
#======================================================================
# NBFAKE logging command to: $NBFAKE_LOG
#     $*
#======================================================================
__EOF

if [[ -z "$NBFAKE_HOST" ]]; then
if [[ -z "$MY_NBFAKE_HOST" ]]; then
  # Run locally
  sh -c "cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $NBFAKE_LOG 2>&1 &"
  sh -c "cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $MY_NBFAKE_LOG 2>&1 &"
else
  # run remotely
  ssh -n -f $NBFAKE_HOST "sh -c \"cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $NBFAKE_LOG 2>&1 &\""
  ssh -n -f $MY_NBFAKE_HOST "sh -c \"cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $MY_NBFAKE_LOG 2>&1 &\""
fi