From owner-svn-soc-all@freebsd.org Thu Aug 20 18:27:27 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 147A49BFEA6 for ; Thu, 20 Aug 2015 18:27:27 +0000 (UTC) (envelope-from kczekirda@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0484A339 for ; Thu, 20 Aug 2015 18:27:27 +0000 (UTC) (envelope-from kczekirda@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7KIRQpd026482 for ; Thu, 20 Aug 2015 18:27:26 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7KIRQFG026476 for svn-soc-all@FreeBSD.org; Thu, 20 Aug 2015 18:27:26 GMT (envelope-from kczekirda@FreeBSD.org) Date: Thu, 20 Aug 2015 18:27:26 GMT Message-Id: <201508201827.t7KIRQFG026476@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r289976 - soc2015/kczekirda/www MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2015 18:27:27 -0000 Author: kczekirda Date: Thu Aug 20 18:27:25 2015 New Revision: 289976 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289976 Log: take task Modified: soc2015/kczekirda/www/menu.py Modified: soc2015/kczekirda/www/menu.py ============================================================================== --- soc2015/kczekirda/www/menu.py Thu Aug 20 17:24:15 2015 (r289975) +++ soc2015/kczekirda/www/menu.py Thu Aug 20 18:27:25 2015 (r289976) @@ -134,13 +134,19 @@ conn.commit() return redirect('/admin') -@route('/admin/take_task/:revision/:host', method='GET') -def take_task(revision,host): +@route('/admin/take_task/:mac', method='GET') +def take_task(mac): conn = sqlite3.connect(database) c = conn.cursor() + c.execute("SELECT host from nodes WHERE mac LIKE '%s'" %mac) + result = c.fetchone() + host = result[0] + c.execute("SELECT revision from tasks WHERE status LIKE 'new' ORDER by ID LIMIT 1") + result = c.fetchone() + revision = result[0] c.execute("UPDATE tasks SET host = ? WHERE revision LIKE ?", (host,revision)) conn.commit() - return redirect('/admin') + return redirect('/static/wait.ipxe') @route('/menu/:mac', method='GET') def static(mac):