From gall at switch.ch Thu Feb 7 13:29:13 2008 From: gall at switch.ch (Alexander Gall) Date: Thu, 7 Feb 2008 14:29:13 +0100 Subject: [dsc] new release 200801301758 In-Reply-To: <20080130182512.L46605@measurement-factory.com> References: <20080130182512.L46605@measurement-factory.com> Message-ID: <18347.1961.564520.827174@hadron.switch.ch> Hello Duane I have upgraded to this version yesterday. I think there is a flaw in upload-rsync.sh that causes it to stop transferring files to the presenter when a new day starts. The upload-prep.pl script puts the XML files into a directory named after the current date. upload-rsync.sh enters this directory and then does cd $YYYYMMDD exec > $PROG.out exec 2>&1 This will cause the file upload-rsync.sh.out to be created *within* this directory. Because of this, the last command of the script cd ..; rmdir $YYYYMMDD 2>/dev/null which is supposed to remove the directory once all XML files have been transferred, will always fail (because the "out" file is always there). When a new day starts, upload-rsync.sh will keep entering the old directory and the new XML files will never be transferred. I have attached a possible fix. Maybe the script should loop through all such directories to be on the safe side? -- Alex --- /tmp/upload-rsync.sh.orig Thu Feb 7 14:22:25 2008 +++ /tmp/upload-rsync.sh Thu Feb 7 14:23:26 2008 @@ -29,11 +29,11 @@ YYYYMMDD=`ls | grep '^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$' | head -1` test -n "$YYYYMMDD" || exit 0 -cd $YYYYMMDD - exec > $PROG.out exec 2>&1 +cd $YYYYMMDD + if test -f $HOME/.ssh/dsc_uploader_id ; then RSYNC_RSH="ssh -i $HOME/.ssh/dsc_uploader_id" export RSYNC_RSH From wessels at measurement-factory.com Thu Feb 7 17:19:15 2008 From: wessels at measurement-factory.com (Duane Wessels) Date: Thu, 7 Feb 2008 10:19:15 -0700 (MST) Subject: [dsc] new release 200801301758 In-Reply-To: <18347.1961.564520.827174@hadron.switch.ch> References: <20080130182512.L46605@measurement-factory.com> <18347.1961.564520.827174@hadron.switch.ch> Message-ID: <20080207101809.H31381@measurement-factory.com> On Thu, 7 Feb 2008, Alexander Gall wrote: > When a new day starts, upload-rsync.sh will keep entering the old > directory and the new XML files will never be transferred. > > I have attached a possible fix. Maybe the script should loop through > all such directories to be on the safe side? Hi Alex, Thanks. Your fix is the correct thing to do. I still want to avoid the complexity of having the script loop through all the date directories. Duane W. From pierre.lebrech at laposte.net Mon Feb 25 16:02:03 2008 From: pierre.lebrech at laposte.net (Pierre LEBRECH) Date: Mon, 25 Feb 2008 17:02:03 +0100 Subject: [dsc] XML file naming conventions Message-ID: <47C2E67B.6010902@laposte.net> Hello, In the doc, I've read that the filename should be something like "1203954060.client_total.xml". It is true with May 15, 2007's release. But, with the last release (2008-01-30), I get a filename like "1203940440.dscdata.xml". Why? Thank you. From wessels at measurement-factory.com Mon Feb 25 19:06:55 2008 From: wessels at measurement-factory.com (Duane Wessels) Date: Mon, 25 Feb 2008 12:06:55 -0700 (MST) Subject: [dsc] XML file naming conventions In-Reply-To: <47C2E67B.6010902@laposte.net> References: <47C2E67B.6010902@laposte.net> Message-ID: <20080225120522.A95433@measurement-factory.com> On Mon, 25 Feb 2008, Pierre LEBRECH wrote: > Hello, > > In the doc, I've read that the filename should be something like "1203954060.client_total.xml". > > It is true with May 15, 2007's release. > > But, with the last release (2008-01-30), I get a filename like "1203940440.dscdata.xml". Hi Pierre, This is a documentation bug. There was a recent code change and I forgot to update the documentation. Previously there was one XML file for each dataset. Now all the datasets go into a single XML file with the "dscdata.xml" name. I'll update the docs ASAP. Duane W.