Skip to content

Commit 1acaa38

Browse files
authored
Merge pull request #108 from DrDaveD/download-stashservers
Change stashcp to read caches list from wlcg-wpad servers by default
2 parents cd84034 + 5423192 commit 1acaa38

6 files changed

Lines changed: 237 additions & 66 deletions

File tree

docs/configs/caches.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[
2+
{"name":"root://its-condor-xrootd1.syr.edu", "status":1},
3+
{"name":"root://sc-cache.chtc.wisc.edu", "status":1},
4+
{"name":"root://osg-new-york-stashcache.nrp.internet2.edu", "status":1},
5+
{"name":"root://osg-kansas-city-stashcache.nrp.internet2.edu", "status":1},
6+
{"name":"root://osg-chicago-stashcache.nrp.internet2.edu", "status":1},
7+
{"name":"root://fiona.uvalight.net", "status":1},
8+
{"name":"root://stashcache.t2.ucsd.edu", "status":1},
9+
{"name":"root://osg-gftp.pace.gatech.edu", "status":1}
10+
]

explanation.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
WARNING: this is out of date. It is only left for historical reasons
2+
13
## Usage
24

35
```
@@ -139,4 +141,4 @@ It is recommended that `$timeout` not be set to 1 second, as tests showed that d
139141

140142
* No record of whether the file was new to the cache it was pulled from or not
141143

142-
* Does not currently allow for file renaming.
144+
* Does not currently allow for file renaming.

setup.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,17 +152,14 @@
152152
#
153153
# If using Python 2.6 or earlier, then these have to be included in
154154
# MANIFEST.in as well.
155-
package_data={'stashcp': ['caches.json'],},
156-
#package_data={ # Optional
157-
# '': ['bin/caches.json'],
158-
#},
155+
package_data={'stashcp': ['opensciencegrid.org.pub'],},
159156

160157
# Although 'package_data' is the preferred approach, in some case you may
161158
# need to place data files outside of your packages. See:
162159
# http://docs.python.org/3.4/distutils/setupscript.html#installing-additional-files
163160
#
164161
# In this case, 'data_file' will be installed into '<sys.prefix>/my_data'
165-
data_files=[('share/stashcache/', ['stashcp/caches.json'])],
162+
data_files=[('share/stashcache/', ['stashcp/opensciencegrid.org.pub'])],
166163

167164
# To provide executable scripts, use entry points in preference to the
168165
# "scripts" keyword. Entry points provide cross-platform support and allow

0 commit comments

Comments
 (0)