Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
ec62801a
Commit
ec62801a
authored
Mar 07, 2011
by
Leigh B Stoller
Browse files
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
parents
99b0a979
6457394a
Changes
2
Hide whitespace changes
Inline
Side-by-side
protogeni/lib/GeniAuthority.pm.in
View file @
ec62801a
...
...
@@ -556,9 +556,16 @@ sub Resolve($$)
#
#
Discover
resources
at
an
authority
(
CM
).
#
sub
DiscoverResources
($$)
sub
DiscoverResources
($$
;$$
)
{
my
($
self
,
$
urn
)
=
@
_
;
my
($
self
,
$
urn
,
$
available
,
$
compress
)
=
@
_
;
if
(
! defined($available)) {
$
available
=
1
;
}
if
(
! defined($compress)) {
$
compress
=
0
;
}
my
$
manager_version
=
$
self
->
Version
();
return
undef
...
...
@@ -586,7 +593,8 @@ sub DiscoverResources($$)
my
$
method_args
;
if
($
manager_version
==
2.0
)
{
$
method_args
->{
'credentials'
}
=
[$
credential
->
asString
()];
$
method_args
->{
'available'
}
=
1
;
$
method_args
->{
'available'
}
=
$
available
;
$
method_args
->{
'compress'
}
=
$
compress
;
}
else
{
print
STDERR
"GeniAuthority::Discover: Unknown version at $self
\n
"
;
...
...
protogeni/scripts/ch_daemon.in
View file @
ec62801a
...
...
@@ -14,7 +14,7 @@ use Getopt::Std;
#
sub
usage
()
{
print
"
Usage: ch_daemon [-d] [-n]
\n
";
print
"
Usage: ch_daemon
[-s]
[-d] [-n]
\n
";
exit
(
1
);
}
my
$optlist
=
"
dns
";
...
...
@@ -183,7 +183,7 @@ sub ProbeCMs()
# Discover resources and cache; for the map client.
# Returns a string of xml.
#
my
$resources
=
$authority
->
DiscoverResources
();
my
$resources
=
$authority
->
DiscoverResources
(
undef
,
0
);
# Errors will go to the log.
next
if
(
!
defined
(
$resources
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment