merge with dev

jlog/models.py

@@ -3,14 +3,13 @@ from django.db import models
 
 class Log(models.Model):
     user = models.CharField(max_length=20, null=True)
-    host = models.CharField(max_length=20, null=True)
+    host = models.CharField(max_length=200, null=True)
     remote_ip = models.CharField(max_length=100)
-    dept_name = models.CharField(max_length=20)
+    login_type = models.CharField(max_length=100)
     log_path = models.CharField(max_length=100)
     start_time = models.DateTimeField(null=True)
-    pid = models.IntegerField(max_length=10)
+    pid = models.IntegerField()
     is_finished = models.BooleanField(default=False)
-    log_finished = models.BooleanField(default=False)
     end_time = models.DateTimeField(null=True)
 
     def __unicode__(self):
@@ -20,4 +19,31 @@ class Log(models.Model):
 class Alert(models.Model):
     msg = models.CharField(max_length=20)
     time = models.DateTimeField(null=True)
-    is_finished = models.BigIntegerField(default=False)
+    is_finished = models.BigIntegerField(default=False)
+
+
+class TtyLog(models.Model):
+    log = models.ForeignKey(Log)
+    datetime = models.DateTimeField(auto_now=True)
+    cmd = models.CharField(max_length=200)
+
+
+class ExecLog(models.Model):
+    user = models.CharField(max_length=100)
+    host = models.TextField()
+    cmd = models.TextField()
+    remote_ip = models.CharField(max_length=100)
+    result = models.TextField(default='')
+    datetime = models.DateTimeField(auto_now=True)
+
+
+class FileLog(models.Model):
+    user = models.CharField(max_length=100)
+    host = models.TextField()
+    filename = models.TextField()
+    type = models.CharField(max_length=20)
+    remote_ip = models.CharField(max_length=100)
+    result = models.TextField(default='')
+    datetime = models.DateTimeField(auto_now=True)
+
+