Merge pull request #381 from elg/master

correction on big log automatic kills
LibrIT · Jun 25, 2019 · a562e60 · a562e60
2 parents c0299a0 + c19c990
commit a562e60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/passhportd/app/models_mod/user.py b/passhportd/app/models_mod/user.py
@@ -20,10 +20,10 @@ class User(db.Model):
     sshkey      = db.Column(db.String(5000), 
                            index=False, unique=True, nullable=False)
     sshkeyhash  = db.Column(db.String(5000),
-                           index=True, unique=False, nullable=True)
+                           index=False, unique=True, nullable=True)
     comment     = db.Column(db.String(5000), index=True)
     superadmin  = db.Column(db.Boolean, unique=False, default=False)
-    logfilesize = db.Column(db.Integer, unique=False)
+    logfilesize = db.Column(db.String(30), unique=False)
 
 
     # Relations (in targetgroups)

diff --git a/passhportd/app/views.py b/passhportd/app/views.py
@@ -159,7 +159,7 @@ def currecntsshconnectionskillbiglog():
                     sshdisconnect(entry.pid)
                     killedpid = str(entry.pid) + " " + killedpid
 
-    return killedpid
+    return "Killed PIDs: " + killedpid
 
 
 @app.route("/connection/ssh/checkandterminate")