Skip to content

sync, 2019-05-07#91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yakra merged 33 commits into from
May 8, 2019
Merged

sync, 2019-05-07 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
616ee5d
rename classes & variables
yakra Mar 23, 2019
15c7bd6
use one class for simple & collapsed edge objects
yakra Mar 25, 2019
84ddc30
concurrent travelers sanity check
yakra Mar 25, 2019
4669828
HGEdge: store canonical HighwaySegment instead of region
yakra Mar 25, 2019
71bbd81
comment: region -> segment
yakra Mar 25, 2019
e0bc96c
HGVertex: is_hidden -> visibility
yakra Mar 26, 2019
45cc586
tm-master-traveled.tmg partial implementation
yakra Mar 27, 2019
55bc552
traveled subgraph partial implementation
yakra Mar 27, 2019
cedc846
full traveled graph implementation
yakra Mar 29, 2019
d49c2d4
remove redundant function
yakra Mar 29, 2019
5b8b8d7
traveled graphs: record only relevant travelers
yakra Mar 30, 2019
5635614
canonical_waypoint_name: if -> elif
yakra Apr 22, 2019
3faa153
Merge pull request #74 from yakra/Python_devel
yakra Apr 22, 2019
f4a8a63
Merge pull request #75 from yakra/Python_devel
yakra Apr 22, 2019
b2de340
minor datacheck speed improvements
yakra Apr 22, 2019
bb0ddbf
Merge pull request #76 from yakra/Python_devel
yakra Apr 22, 2019
0dcab3f
Merge pull request #77 from yakra/Python_devel
yakra Apr 22, 2019
95969e1
comments for duplicate label datacheck
yakra Apr 23, 2019
0e7b5c5
Merge pull request #78 from yakra/Python_devel
yakra Apr 23, 2019
db94c0b
Merge pull request #79 from yakra/Python_devel
yakra Apr 23, 2019
48ed3df
terminal LF in traveled graphs (Python)
yakra Apr 23, 2019
013d7ed
Merge pull request #82 from yakra/Python_devel
yakra Apr 23, 2019
065c17d
Merge pull request #83 from yakra/Python_devel
yakra Apr 23, 2019
e815c31
finalizing traveled graphs
yakra Apr 23, 2019
e542667
Merge pull request #84 from yakra/RelevantTrav
yakra Apr 23, 2019
8c73f35
Merge pull request #210 from yakra/master
yakra Apr 25, 2019
6344309
Merge pull request #212 from yakra/master
yakra Apr 26, 2019
f3f8bef
Merge pull request #214 from yakra/master
yakra Apr 27, 2019
d63974f
Python: remove unused ClinchedSegmentEntry class
yakra Apr 28, 2019
0ede2eb
TravelerList.clinched_by: list -> set
yakra May 2, 2019
c492192
Merge pull request #201 from yakra/tmg2_Python
jteresco May 8, 2019
7cfbe1e
Merge pull request #216 from yakra/cleanup_Python
jteresco May 8, 2019
b2f0fdb
Omit DB switch when not installing results.
jteresco May 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions siteupdate/python-teresco/localupdate.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,19 +42,23 @@ mkdir -p $datestr/$logdir/users $datestr/$statdir $datestr/$nmpmdir $datestr/$lo
if [ "$graphflag" != "-k" ]; then
mkdir -p $datestr/$graphdir
fi
echo "$0: switching to DB copy"
ln -sf $tmwebbase/lib/tm.conf.updating $tmwebbase/lib/tm.conf
touch $tmwebbase/dbupdating
echo "**********************************************************************"
echo "**********************************************************************"
echo "* *"
echo "* CHECKING FOR USER SLEEP MYSQL PROCESSES USING SHOW PROCESSLIST; *"
echo "* REMOVE ANY ENTRIES BEFORE THE SITE UPDATE SCRIPT FINISHES TO AVOID *"
echo "* A POSSIBLE HANG DURING INGESTION OF THE NEW .sql FILE. *"
echo "* *"
echo "**********************************************************************"
echo "**********************************************************************"
echo "show processlist;" | mysql --defaults-group-suffix=travmap -u travmap
if [ "$install" == "1" ]; then
echo "$0: switching to DB copy"
ln -sf $tmwebbase/lib/tm.conf.updating $tmwebbase/lib/tm.conf
touch $tmwebbase/dbupdating
echo "**********************************************************************"
echo "**********************************************************************"
echo "* *"
echo "* CHECKING FOR USER SLEEP MYSQL PROCESSES USING SHOW PROCESSLIST; *"
echo "* REMOVE ANY ENTRIES BEFORE THE SITE UPDATE SCRIPT FINISHES TO AVOID *"
echo "* A POSSIBLE HANG DURING INGESTION OF THE NEW .sql FILE. *"
echo "* *"
echo "**********************************************************************"
echo "**********************************************************************"
echo "show processlist;" | mysql --defaults-group-suffix=travmap -u travmap
else
echo "$0: SKIPPING switch to DB copy"
fi

echo "$0: launching siteupdate.py"
PYTHONIOENCODING='utf-8' ./siteupdate.py -d TravelMapping-$datestr $graphflag -l $datestr/$logdir -c $datestr/$statdir -g $datestr/$graphdir -n $datestr/$nmpmdir | tee $datestr/$logdir/siteupdate.log 2>&1 || exit 1
Expand Down
Loading