Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
T
tun
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Railgun
tun
Commits
94512cac
Commit
94512cac
authored
Dec 12, 2020
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "fix local gateway mark again"
This reverts commit
04b212d5
.
parent
04b212d5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
src/inventory.ts
src/inventory.ts
+4
-1
No files found.
src/inventory.ts
View file @
94512cac
...
@@ -22,6 +22,9 @@ class InventoryBuilder {
...
@@ -22,6 +22,9 @@ class InventoryBuilder {
async
loadGateways
()
{
async
loadGateways
()
{
const
gateways
=
await
this
.
load
(
'
gateways2
'
);
const
gateways
=
await
this
.
load
(
'
gateways2
'
);
for
(
let
gateway
of
gateways
)
{
gateway
.
selectionMark
=
gateway
.
mark
+
50
;
}
return
gateways
;
return
gateways
;
}
}
...
@@ -150,7 +153,7 @@ class InventoryBuilder {
...
@@ -150,7 +153,7 @@ class InventoryBuilder {
const
localGatewayName
=
(
cis
?
params
.
lif
:
params
.
rif
)
||
params
.
if
;
const
localGatewayName
=
(
cis
?
params
.
lif
:
params
.
rif
)
||
params
.
if
;
const
localGateway
=
localGatewayName
?
this
.
gateways
[
local
.
name
][
localGatewayName
]
:
_
.
find
(
this
.
gateways
[
local
.
name
]);
const
localGateway
=
localGatewayName
?
this
.
gateways
[
local
.
name
][
localGatewayName
]
:
_
.
find
(
this
.
gateways
[
local
.
name
]);
//console.log(local.name, paramsString, params, localGatewayName, localGateway.name)
//console.log(local.name, paramsString, params, localGatewayName, localGateway.name)
const
localGatewayMark
=
parseInt
(
localGateway
.
m
ark
)
||
0
;
const
localGatewayMark
=
parseInt
(
localGateway
.
selectionM
ark
)
||
0
;
const
remoteGatewayName
=
(
cis
?
params
.
rif
:
params
.
lif
)
||
params
.
if
;
const
remoteGatewayName
=
(
cis
?
params
.
rif
:
params
.
lif
)
||
params
.
if
;
const
remoteGateway
=
remoteGatewayName
?
this
.
gateways
[
remote
.
name
][
remoteGatewayName
]
:
_
.
find
(
this
.
gateways
[
remote
.
name
]);
const
remoteGateway
=
remoteGatewayName
?
this
.
gateways
[
remote
.
name
][
remoteGatewayName
]
:
_
.
find
(
this
.
gateways
[
remote
.
name
]);
//const remoteGatewayMark = remoteGatewayName ? remoteGateway.mark : undefined;
//const remoteGatewayMark = remoteGatewayName ? remoteGateway.mark : undefined;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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