X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=queries.ipynb;fp=queries.ipynb;h=38b22c920a3376b160c59743880c13690b930895;hb=fa101ebf71cd46c51df29eac35a001f60dd6434e;hp=b2a54d3648264bb124b9f9ab86c01eb609276e8c;hpb=4501f68fa04a34934ff3c3ec8e9ddf43e060c5e5;p=dmarc.git

diff --git a/queries.ipynb b/queries.ipynb
index b2a54d3..38b22c9 100644
--- a/queries.ipynb
+++ b/queries.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 1,
    "metadata": {
     "collapsed": true
    },
@@ -22,7 +22,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
@@ -33,7 +33,7 @@
        "['dmarc.ini']"
       ]
      },
-     "execution_count": 5,
+     "execution_count": 2,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -45,7 +45,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 31,
+   "execution_count": 3,
    "metadata": {
     "collapsed": false
    },
@@ -97,19 +97,21 @@
        " (('google.com', 'softfail', 'pass', '146.185.136.235'), 'new.realms.co.uk'),\n",
        " (('google.com', 'pass', 'pass', '82.109.184.9'), 'clublloyds.com'),\n",
        " (('Yahoo! Inc.', 'softfail', 'pass', '65.20.0.12'), 'lb.lon5.cpcloud.co.uk'),\n",
+       " (('Yahoo! Inc.', 'softfail', 'pass', '65.20.0.12'), 'lb.lon5.cpcloud.co.uk'),\n",
        " (('Yahoo! Inc.', 'softfail', 'pass', '65.20.0.12'), 'lb.lon5.cpcloud.co.uk')]"
       ]
      },
-     "execution_count": 31,
+     "execution_count": 3,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "with psycopg2.connect(host=config['database']['server'],\n",
+    "conn = psycopg2.connect(host=config['database']['server'],\n",
     "                        database=config['database']['database'], \n",
     "                        user=config['database']['username'], \n",
-    "                        password=config['database']['password']) as conn:\n",
+    "                        password=config['database']['password'])\n",
+    "with conn:\n",
     "    with conn.cursor() as cur:\n",
     "        cur.execute(\"\"\"\n",
     "        select report_metadata_org_name, auth_results_spf_result, auth_results_dkim_result, source_ip \n",
@@ -122,7 +124,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 32,
+   "execution_count": 4,
    "metadata": {
     "collapsed": false
    },
@@ -171,19 +173,17 @@
        " (('google.com', 'softfail', 'pass', '146.185.136.235'), 'new.realms.co.uk'),\n",
        " (('google.com', 'softfail', 'pass', '146.185.136.235'), 'new.realms.co.uk'),\n",
        " (('Yahoo! Inc.', 'softfail', 'pass', '65.20.0.12'), 'lb.lon5.cpcloud.co.uk'),\n",
+       " (('Yahoo! Inc.', 'softfail', 'pass', '65.20.0.12'), 'lb.lon5.cpcloud.co.uk'),\n",
        " (('Yahoo! Inc.', 'softfail', 'pass', '65.20.0.12'), 'lb.lon5.cpcloud.co.uk')]"
       ]
      },
-     "execution_count": 32,
+     "execution_count": 4,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "with psycopg2.connect(host=config['database']['server'],\n",
-    "                        database=config['database']['database'], \n",
-    "                        user=config['database']['username'], \n",
-    "                        password=config['database']['password']) as conn:\n",
+    "with conn:\n",
     "    with conn.cursor() as cur:\n",
     "        cur.execute(\"\"\"\n",
     "        select report_metadata_org_name, auth_results_spf_result, auth_results_dkim_result, source_ip \n",
@@ -196,7 +196,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": 5,
    "metadata": {
     "collapsed": false
    },
@@ -207,7 +207,7 @@
        "'lb.lon5.cpcloud.co.uk'"
       ]
      },
-     "execution_count": 20,
+     "execution_count": 5,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -218,7 +218,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 30,
+   "execution_count": 6,
    "metadata": {
     "collapsed": false
    },
@@ -313,10 +313,12 @@
        " ('1458957186.548175',),\n",
        " ('1459129809.695034',),\n",
        " ('1459216304.582931',),\n",
+       " ('1459302353.261157',),\n",
        " ('14593873841710243963',),\n",
        " ('14661842628106423589',),\n",
        " ('14662396456930987863',),\n",
        " ('15111277194568576101',),\n",
+       " ('15185964531645951164',),\n",
        " ('15410706527896810898',),\n",
        " ('15497495941279624940',),\n",
        " ('15974729567081493290',),\n",
@@ -374,6 +376,7 @@
        " ('726a3261dfab4b4590b5fc898c561b08@hotmail.com',),\n",
        " ('730219275619457',),\n",
        " ('75eef2128eb84e9ca8e4837f3d4e31bd@hotmail.com',),\n",
+       " ('7773a696f4a54f1e8c01f4644fbb94ee@hotmail.com',),\n",
        " ('77b6c2aa32bf440aa240195db229cd4a@hotmail.com',),\n",
        " ('7815164892280952980',),\n",
        " ('7834597727856283739',),\n",
@@ -404,16 +407,13 @@
        " ('fc0750780e0d4b1395c4c9f41cb9791f@hotmail.com',)]"
       ]
      },
-     "execution_count": 30,
+     "execution_count": 6,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "with psycopg2.connect(host=config['database']['server'],\n",
-    "                        database=config['database']['database'], \n",
-    "                        user=config['database']['username'], \n",
-    "                        password=config['database']['password']) as conn:\n",
+    "with conn:\n",
     "    with conn.cursor() as cur:\n",
     "        cur.execute(\"\"\"\n",
     "        select report_metadata_report_id\n",
@@ -424,12 +424,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 7,
    "metadata": {
     "collapsed": true
    },
    "outputs": [],
-   "source": []
+   "source": [
+    "conn.close()"
+   ]
   }
  ],
  "metadata": {