Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
strudel2_backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hpc-team
strudel2_backend
Commits
8144c7a5
Commit
8144c7a5
authored
2 years ago
by
Chris Hines
Browse files
Options
Downloads
Plain Diff
Merge branch 'dev' into 'test'
Dev See merge request
!94
parents
80b95a69
bc30f0a1
No related branches found
Branches containing commit
No related tags found
2 merge requests
!95
Test
,
!94
Dev
Pipeline
#68927
passed
2 years ago
Stage: build
Stage: deploy
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
tes/__init__.py
+10
-0
10 additions, 0 deletions
tes/__init__.py
tes/sshwrapper/__init__.py
+6
-0
6 additions, 0 deletions
tes/sshwrapper/__init__.py
tes/tunnelstat/__init__.py
+1
-0
1 addition, 0 deletions
tes/tunnelstat/__init__.py
twsproxy/__init__.py
+1
-1
1 addition, 1 deletion
twsproxy/__init__.py
with
18 additions
and
1 deletion
tes/__init__.py
+
10
−
0
View file @
8144c7a5
...
...
@@ -27,6 +27,8 @@ else:
api
=
Api
(
app
)
sshsessions
=
{}
lastcleanup
=
datetime
.
datetime
.
now
()
cleanupinterval
=
datetime
.
timedelta
(
minutes
=
10
)
if
DEV
:
from
flask_cors
import
CORS
,
cross_origin
CORS
(
app
,
supports_credentials
=
True
,
origin
=
"
localhost:4200
"
)
...
...
@@ -44,6 +46,13 @@ def after_cleanup_sessions(response):
import
logging
import
hashlib
import
json
global
lastcleanup
global
sshsessions
now
=
datetime
.
datetime
.
now
()
if
(
now
-
lastcleanup
)
<
cleanupinterval
:
return
response
lastcleanup
=
datetime
.
datetime
.
now
()
logger
=
logging
.
getLogger
()
events
=
logging
.
getLogger
(
'
connection_events
'
)
slist
=
[]
...
...
@@ -79,6 +88,7 @@ def after_cleanup_sessions(response):
logger
.
error
(
e
)
logger
.
error
(
traceback
.
format_exc
())
events
.
info
(
'
currently {} active sessions
'
.
format
(
len
(
sshsessions
)))
return
response
...
...
This diff is collapsed.
Click to expand it.
tes/sshwrapper/__init__.py
+
6
−
0
View file @
8144c7a5
...
...
@@ -150,6 +150,12 @@ class Ssh:
return
ctrlsocket
else
:
sess
.
lock
.
release
()
try
:
certs
=
sess
.
get_certs
()
if
b
'
The agent has no identities.
\n
'
==
certs
:
raise
SshCtrlException
(
certs
.
decode
())
except
Exception
as
e
:
pass
raise
SshCtrlException
(
stderr
.
decode
())
@staticmethod
...
...
This diff is collapsed.
Click to expand it.
tes/tunnelstat/__init__.py
+
1
−
0
View file @
8144c7a5
...
...
@@ -14,6 +14,7 @@ class SSHSession:
"""
def
__init__
(
self
,
sshsessid
,
**
kwargs
):
self
.
last
=
datetime
.
datetime
.
now
()
self
.
first
=
datetime
.
datetime
.
now
()
self
.
socket
=
None
self
.
token
=
None
self
.
port
=
{}
...
...
This diff is collapsed.
Click to expand it.
twsproxy/__init__.py
+
1
−
1
View file @
8144c7a5
...
...
@@ -198,7 +198,7 @@ def mainserver(port=None):
to_log
=
to_log
+
traceback
.
format_exc
()
logging
.
basicConfig
(
filename
=
os
.
path
.
expanduser
(
"
~/.tws.log
"
),
format
=
"
%(asctime)s %(levelname)s:%(process)s: %(message)s
"
)
logger
=
logging
.
getLogger
()
logger
.
setLevel
(
logging
.
DEBUG
)
logger
.
setLevel
(
logging
.
ERROR
)
if
to_log
is
not
None
:
logger
.
debug
(
to_log
)
logger
.
debug
(
"
starting TWS proxy
"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment