few fix + log

Author: Nodraak

.gitignore

@@ -4,6 +4,8 @@
 # prod files
 iTeam/settings_prod.py
 gunicorn_start.sh
+deploy.sh
+git_version.txt
 
 # dev files
 *.pyc

iTeam/middleware.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Author: Adrien Chardon
+# @Date:   2014-10-28 19:29:36
+# @Last Modified by:   Adrien Chardon
+# @Last Modified time: 2014-10-28 19:44:28
+
+# This file is part of iTeam.org.
+# Copyright (C) 2014 Adrien Chardon (Nodraak).
+#
+# iTeam.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# iTeam.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with iTeam.org. If not, see <http://www.gnu.org/licenses/>.
+
+
+from iTeam.stats.models import Log
+
+
+class Log_middleware(object):
+
+    def process_request(self, request):
+        url = request.get_full_path()
+        head = url.split('/')[1]
+
+        if head != 'admin':
+            l = Log().set_attr(request)
+            l.save()

iTeam/publications/views.py

@@ -3,7 +3,7 @@
 # @Author: Adrien Chardon
 # @Date:   2014-08-21 18:22:36
 # @Last Modified by:   Adrien Chardon
-# @Last Modified time: 2014-10-27 19:25:58
+# @Last Modified time: 2014-10-28 19:53:32
 
 # This file is part of iTeam.org.
 # Copyright (C) 2014 Adrien Chardon (Nodraak).
@@ -76,10 +76,7 @@ def detail(request, publication_id, publication_slug):
 
     # Redirect if bad tutorial slug but item exists (Make sure the URL is well-formed)
     if publication_slug != slugify(publication.title):
-        print 'bad slug = %s' % publication_slug
         return redirect(publication.get_absolute_url(), permanent=True)
-    else:
-        print 'slug ok : %s' % publication_slug
 
     # default view, published article
     if not publication.is_draft:

iTeam/settings.py

@@ -3,7 +3,7 @@
 # @Author: Adrien Chardon
 # @Date:   2014-09-02 12:01:06
 # @Last Modified by:   Adrien Chardon
-# @Last Modified time: 2014-10-28 11:33:49
+# @Last Modified time: 2014-10-28 19:46:39
 
 # This file is part of iTeam.org.
 # Copyright (C) 2014 Adrien Chardon (Nodraak).
@@ -141,6 +141,7 @@
     'iTeam.publications',
     'iTeam.medias',
     'iTeam.events',
+    'iTeam.stats',
 
     'django.contrib.admin',
     'django.contrib.auth',
@@ -159,6 +160,8 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+
+    'iTeam.middleware.Log_middleware',
 )
 
 ROOT_URLCONF = 'iTeam.urls'

iTeam/stats/__init__.py

@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Author: Adrien Chardon
+# @Date:   2014-10-28 19:45:49
+# @Last Modified by:   Adrien Chardon
+# @Last Modified time: 2014-10-28 19:54:28
+
+# This file is part of iTeam.org.
+# Copyright (C) 2014 Adrien Chardon (Nodraak).
+#
+# iTeam.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# iTeam.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with iTeam.org. If not, see <http://www.gnu.org/licenses/>.
+
+
+from django.contrib import admin
+from iTeam.stats.models import Log
+
+
+class LogAdmin(admin.ModelAdmin):
+    # fields for ALL publications
+    list_display = ('ip', 'date', 'url', 'method', 'referer')
+
+    list_filter = ['ip', 'date', 'url', 'method', 'referer']
+    search_fields = ['ip', 'date', 'url', 'method', 'referer']
+
+
+admin.site.register(Log, LogAdmin)

iTeam/stats/admin.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Author: Adrien Chardon
+# @Date:   2014-10-28 19:07:27
+# @Last Modified by:   Adrien Chardon
+# @Last Modified time: 2014-10-28 19:53:46
+
+# This file is part of iTeam.org.
+# Copyright (C) 2014 Adrien Chardon (Nodraak).
+#
+# iTeam.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# iTeam.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with iTeam.org. If not, see <http://www.gnu.org/licenses/>.
+
+
+from django.db import models
+from django.utils import timezone
+
+
+class Log(models.Model):
+    ip = models.CharField(max_length=256)
+    date = models.DateTimeField()
+    url = models.CharField(max_length=256)
+    method = models.CharField(max_length=256)
+    referer = models.CharField(max_length=256)
+
+    def set_attr(self, request):
+        self.ip = request.META['REMOTE_ADDR']
+        self.date = timezone.now()
+        self.url = request.get_full_path()
+        self.method = request.META['REQUEST_METHOD']
+
+        if 'HTTP_REFERER' in request.META:
+            self.referer = request.META['HTTP_REFERER']
+        else:
+            self.referer = '-'
+
+        return self

iTeam/stats/models.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

iTeam/stats/tests.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

iTeam/stats/views.py

@@ -51,13 +51,13 @@ sudo ln -s /etc/nginx/sites-available/iteam /etc/nginx/sites-enabled/iteam
 sudo service nginx reload
 
 # Display current branch and commit
-DEPLOYED_HASH=$(git show-ref --tags | grep v1.0-RC1.1 | cut -d " " -f 1)
-DEPLOYED_TAG=$(git show-ref --tags | grep v1.0-RC1.1 | cut -d " " -f 2 | cut -d "/" -f 3)
+DEPLOYED_HASH=$(git show-ref --tags | grep $1 | cut -d " " -f 1)
+DEPLOYED_TAG=$(git show-ref --tags | grep $1 | cut -d " " -f 2 | cut -d "/" -f 3)
 HEAD_HASH=$(git rev-parse HEAD)
 
 echo "$DEPLOYED_TAG" > git_version.txt
 
 echo "Commit deployé :"
-echo "tag\t$DEPLOYED_TAG"
-echo "hash\t$DEPLOYED_HASH"
-echo "head\t$HEAD_HASH"
+echo "tag    $DEPLOYED_TAG"
+echo "hash   $DEPLOYED_HASH"
+echo "head   $HEAD_HASH"